diff --git a/Makefile.in b/Makefile.in
index 8a5b5e8..da81061 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,7 +106,7 @@ APPS		= cligen_hello cligen_file cligen_tutorial
 YACC		= @YACC@
 LEX		= @LEX@
 
-all:	cligen $(APPS) write_version
+all:	cligen $(APPS)
 
 ifeq ($(LINKAGE),dynamic)
 all:	 $(MYLIBDYNAMIC)
@@ -114,7 +114,7 @@ else
 all:	 $(MYSTATIC)
 endif
 
-.PHONY: TAGS test write_version
+.PHONY: TAGS test
 TAGS:
 	find . -name '*.[chyl]' -print | xargs etags
 
@@ -124,9 +124,6 @@ TAGS:
 test:
 	(cd test && SKIPLIST="$(SKIPLIST)" CFLAGS="$(CFLAGS)" LINKAGE="$(LINKAGE)" ./all.sh)
 
-write_version:
-	@echo $(shell PREFIX=cligen ./version.sh)
-
 distclean: clean
 	rm -f Makefile config.log config.status config.h TAGS .depend
 	rm -rf autom4te.cache build.c cligen_config.h
diff --git a/configure b/configure
index c154bdb..73cf9c2 100755
--- a/configure
+++ b/configure
@@ -2506,7 +2506,7 @@ ac_config_headers="$ac_config_headers cligen_config.h"
 
 
 # Use GIT version (what if no git?)
-CLIGEN_VERSION="$(./version.sh)"
+CLIGEN_VERSION="$(./scripts/version.sh)"
 CLIGEN_VERSION2=$(echo ${CLIGEN_VERSION} | awk -F- '{print $1}')
 CLIGEN_VERSION_MAJOR=$(echo ${CLIGEN_VERSION2} | awk -F. '{print $1}')
 CLIGEN_VERSION_MINOR=$(echo ${CLIGEN_VERSION2} | awk -F. '{print $2}')
diff --git a/configure.ac b/configure.ac
index 8bf0a3a..ce89fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AC_SUBST(CLIGEN_VERSION_MINOR)
 AC_SUBST(CLIGEN_VERSION_PATCH)
 
 # Use GIT version (what if no git?)
-CLIGEN_VERSION="$(./version.sh)"
+CLIGEN_VERSION="$(./scripts/version.sh)"
 CLIGEN_VERSION2=$(echo ${CLIGEN_VERSION} | awk -F- '{print $1}')
 CLIGEN_VERSION_MAJOR=$(echo ${CLIGEN_VERSION2} | awk -F. '{print $1}')
 CLIGEN_VERSION_MINOR=$(echo ${CLIGEN_VERSION2} | awk -F. '{print $2}')
diff --git a/build_deb.sh b/scripts/build_deb.sh
similarity index 100%
rename from build_deb.sh
rename to scripts/build_deb.sh
diff --git a/version.sh b/scripts/version.sh
similarity index 100%
rename from version.sh
rename to scripts/version.sh