--- a/Makefile.bundle.in	Sun Sep 07 22:23:25 2008 +0000
+++ b/Makefile.bundle.in	Mon Sep 08 06:27:08 2008 +0000
@@ -8,7 +8,7 @@
 else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1)
+REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 endif
 
 # Make sure we have something in REV

--- a/Makefile.src.in	Sun Sep 07 22:23:25 2008 +0000
+++ b/Makefile.src.in	Mon Sep 08 06:27:08 2008 +0000
@@ -91,7 +91,7 @@
 # Always run version detection, so we always have an accurate modified
 # flag
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3)
+MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 
 ifdef REVISION
 # Use specified revision (which should be of the form "r000").
@@ -99,8 +99,8 @@
 REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g")
 else
 # Use autodetected revisions
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1)
-REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2)
+REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
 endif
 
 # Make sure we have something in REV and REV_NR