diff --git a/Makefile.in b/Makefile.in
index e17f0a74..c821975b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,51 +135,17 @@ dep depend fastdep: $(DEPEND_FILE)
 ################################################################################
 dev: distclean autotools all
 
-################################################################################
-# DEV-GIT, BUILD with developer flags                                          #
-################################################################################
-dev-git: distclean autotools-git all
-
-
-################################################################################
-# GIT, BUILD with developer flags                                              #
-################################################################################
-build-commit-git: distclean set-version-git all
-
-################################################################################
-# CURRENT, BUILD current svn trunk.                                            #
-################################################################################
-current: distclean svn autotools all
-
-svn:
-	svn update
-
 autotools:
-	@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
+	@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
 	autoconf
 	./configure --with-developer-flags 
 
-autotools-git:
-	@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
-	autoconf
-	./configure --with-developer-flags 
-
-
-build-commit: distclean svn set-version all
-
 set-version:
-	@sed -e 's/.\/version.sh/.\/commit-version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
+	@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
 	autoconf
-	@sed -e 's/.\/commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
+	@sed -e 's/.\/version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
 	./configure --with-developer-flags
 
-set-version-git:
-	@sed -e 's/.\/version.sh/.\/git-commit-version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
-	autoconf
-	@sed -e 's/.\/git-commit-version.sh/.\/version.sh/g' configure.ac > configure.ac.tmp && mv -f configure.ac.tmp configure.ac
-	./configure --with-developer-flags
-
-
 help:
 	@echo "--------------------------------------------------------------------------------"
 	@echo "make                   Build motion from local copy in your computer"	
@@ -265,7 +231,7 @@ clean: pre-build-info
 ################################################################################
 # DIST restores the directory to distribution state.                           #
 ################################################################################
-dist: distclean updateguide
+dist: distclean 
 	@chmod -R 644 *
 	@chmod 755 configure
 	@chmod 755 version.sh
diff --git a/commit-version.sh b/commit-version.sh
deleted file mode 100755
index e821a069..00000000
--- a/commit-version.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-BASE_VERSION="4.0"
-if [ -d .git ]; then
-	GIT_COMMIT=`git show -s --format=%h`
-	echo -n "$BASE_VERSION+git$GIT_COMMIT"
-else
-	echo -n "$BASE_VERSION"
-fi
diff --git a/git-commit-version.sh b/git-commit-version.sh
deleted file mode 100755
index e821a069..00000000
--- a/git-commit-version.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-BASE_VERSION="4.0"
-if [ -d .git ]; then
-	GIT_COMMIT=`git show -s --format=%h`
-	echo -n "$BASE_VERSION+git$GIT_COMMIT"
-else
-	echo -n "$BASE_VERSION"
-fi
diff --git a/version.sh b/version.sh
index e821a069..2d69ed5e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-BASE_VERSION="4.0"
+BASE_VERSION="4.0.1"
 if [ -d .git ]; then
 	GIT_COMMIT=`git show -s --format=%h`
-	echo -n "$BASE_VERSION+git$GIT_COMMIT"
+	printf "$BASE_VERSION+git$GIT_COMMIT"
 else
-	echo -n "$BASE_VERSION"
+	printf "$BASE_VERSION+gitUNKNOWN"
 fi