diff --git a/cloud.spec b/cloud.spec
index 988d3eaaa40..f8bbcdc7ad2 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -340,7 +340,7 @@ echo Doing open source build
 # this fixes the /usr/com bug on centos5
 %define _localstatedir /var
 %define _sharedstatedir /var/lib
-./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{_bindir} --javadir=%{_javadir} --sharedstatedir=%{_sharedstatedir} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --docdir=%{_docdir}/%{name}-%{version} --with-tomcat=%{_datadir}/tomcat6 --tomcat-user=%{name} --fast --build-number=%{_ver}-%{release}
+./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{_bindir} --javadir=%{_javadir} --sharedstatedir=%{_sharedstatedir} --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --docdir=%{_docdir}/%{name}-%{version} --with-tomcat=%{_datadir}/tomcat6 --tomcat-user=%{name} --fast --build-number=%{_ver}-%{release} --package-version=%{_ver}
 ./waf build --build-number=%{?_build_number} --package-version=%{_ver}
 
 %install
diff --git a/wscript_build b/wscript_build
index 18f02dabd9d..9b806147e3d 100644
--- a/wscript_build
+++ b/wscript_build
@@ -42,12 +42,7 @@ def build_utils_docs ():
 # ant only needs to be reinvoked if the version with build number changes
 # we here trim all the depended targets from the target list:
 def build_jars ():
-	builddate = time.strftime("%Y.%m.%d.%H.%M.%S", time.localtime());
-	if Options.options.VERNUM:
-		Implementation_Version = Options.options.VERNUM
-	else:
-		Implementation_Version = "2.2"
-	Implementation_Version = Implementation_Version + "." + builddate
+	Implementation_Version = bld.env.VERSION
 
 	# this is to trigger recompilation / cache avoidance if the relevant environment for ant changes
 	ant_args = [
@@ -276,7 +271,11 @@ def build_conf_files ():
 
 # cloudstack-proprietary still has db files for usage
 def build_db_files ():
-	bld.install_files_filtered("${SETUPDATADIR}",filelist("*/db/* cloudstack-proprietary/*/db/*",excl=Node.exclude_regs + "\ncloud-gate\ncloud-bridge"))
+	#bld.install_files_filtered("${SETUPDATADIR}",filelist("*/db/* cloudstack-proprietary/*/db/*",excl=Node.exclude_regs + "\ncloud-gate\ncloud-bridge"))
+	start_path = bld.path.find_dir ("setup/db")
+	bld.substitute('**',"${SETUPDATADIR}", cwd=start_path)
+	start_path = bld.path.find_dir ("cloudstack-proprietary/premium/db")
+	bld.substitute('**',"${SETUPDATADIR}", cwd=start_path)
 
 
 def build_plugins ():
diff --git a/wscript_configure b/wscript_configure
index 8d05d5b69a6..78fc17b8dbb 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -10,6 +10,7 @@ try: from os import getuid as _getuid
 except ImportError: pass
 from os.path import abspath as _abspath, basename as _basename, dirname as _dirname, exists as _exists, isdir as _isdir, split as _split, join as _join, expanduser as _expanduser, sep, pathsep, pardir
 from glob import glob as _glob
+import time
 
 
 # list of JARs that provide the build dependencies
@@ -103,7 +104,12 @@ hard_deps = [
 ]
 
 
-conf.env.VERSION = Utils.g_module.VERSION
+if Options.options.VERNUM:
+	Version = Options.options.VERNUM
+else:
+	Version = "2.2"
+builddate = time.strftime("%Y.%m.%d.%H.%M.%S", time.localtime()).replace('.','')
+conf.env.VERSION = Version + "." + builddate
 
 conf.check_message_1('Detecting distribution')
 if Options.platform == 'win32': conf.env.DISTRO = "Windows"
@@ -279,8 +285,6 @@ conf.env.CLASSPATH = pathsep.join(compilecp)
 conf.check_message_2('Done','GREEN')
 
 # log4j config and property config files require backslash escapes on Windows
-#conf.env.VERSION = Utils.g_module.VERSION
-conf.env.VERSION = Utils.getbuildnumber ()
 
 conf.env.AGENTLIBDIR = Utils.subst_vars(_join("${LIBDIR}","${AGENTPATH}"),conf.env)
 conf.env.AGENTSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${AGENTPATH}"),conf.env)