diff --git a/Makefile b/Makefile
index b6891a4..361fed5 100755
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+BUILDLIB:=MANZAN
+MANZAN_TEMPLIB:=MANZANBLD
+BUILDVERSION:="Development build \(built with Make\)"
 
 .PHONY: ile camel test
 
@@ -20,3 +23,24 @@ install:
 uninstall:
 	gmake -C ile uninstall
 	gmake -C config uninstall
+
+manzan-v%.zip: /QOpenSys/pkgs/bin/zip
+	echo "Building version $*"
+	system "clrlib ${MANZAN_TEMPLIB}" || system "crtlib ${MANZAN_TEMPLIB}"
+	system "dltlib ${BUILDLIB}" || echo "could not delete"
+	system "crtlib ${BUILDLIB}"
+	system "dltlib ${BUILDLIB}"
+	rm -fr /QOpenSys/etc/manzan
+	gmake -C config BUILDVERSION="$*" install
+	gmake -C ile BUILDVERSION="$*"
+	gmake -C camel BUILDVERSION="$*" clean install
+	system "crtsavf ${MANZAN_TEMPLIB}/distqsys"
+	system "crtsavf ${MANZAN_TEMPLIB}/diststmf"
+	rm -f /qsys.lib/${MANZAN_TEMPLIB}.lib/*.MODULE
+	system "SAV DEV('/qsys.lib/${MANZAN_TEMPLIB}.lib/distqsys.file') OBJ(('/qsys.lib/manzan.lib')) SAVACT(*YES)"
+	cp /qsys.lib/${MANZAN_TEMPLIB}.lib/distqsys.file .
+	system "SAV DEV('/qsys.lib/${MANZAN_TEMPLIB}.lib/diststmf.file') OBJ(('/opt/manzan') ('/QOpenSys/etc/manzan')) SAVACT(*YES)"
+	cp /qsys.lib/${MANZAN_TEMPLIB}.lib/diststmf.file .
+	/QOpenSys/pkgs/bin/zip -v -0 $@ diststmf.file distqsys.file
+	rm diststmf.file distqsys.file
+	system "dltlib ${MANZAN_TEMPLIB}"
diff --git a/camel/Makefile b/camel/Makefile
index 948c342..20f296d 100755
--- a/camel/Makefile
+++ b/camel/Makefile
@@ -1,10 +1,12 @@
 
 
+BUILDVERSION:="Development build \(built with Make\)"
+
 .PHONY: mkdirs
 
 JAVA_SRCS := $(shell find src -type f)
 target/manzan.jar: ${JAVA_SRCS} /QOpenSys/pkgs/bin/mvn
-	JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit /QOpenSys/pkgs/bin/mvn -Djava.net.preferIPv4Stack=true package
+	JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit /QOpenSys/pkgs/bin/mvn -Djava.net.preferIPv4Stack=true "-Dmanzan.version=${BUILDVERSION}" package
 	cp target/manzan-*-with-dependencies.jar target/manzan.jar
 
 mkdirs: