diff --git a/cloud.spec b/cloud.spec
index 62f4a08ac72..690b3fddd4d 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -337,7 +337,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
+./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 build --build-number=%{?_build_number}
 
 %install
diff --git a/wscript_build b/wscript_build
index 8c1f9e28455..1a31647fed2 100644
--- a/wscript_build
+++ b/wscript_build
@@ -53,6 +53,7 @@ def build_jars ():
 		"-Ddist.dir=%s" % distdir,
 		"-Dbase.dir=%s" % sourcedir,
 		"-f %s" % Utils.relpath (_join(sourcedir, "build.xml")),
+		"-Dimpl.version=%s" % Utils.getbuildnumber (),
 	]
 	if not buildpremium: ant_args += ["-DOSS=true"]
 
diff --git a/wscript_configure b/wscript_configure
index d941510c5f0..349d4e4a806 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -262,7 +262,8 @@ 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.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)