diff --git a/build.gradle b/build.gradle
index 7e12bc7..868f580 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,15 @@
 class Version {
-    Project proj
+
+	String timestamp
+
+    Version(def properties) {
+	    this.timestamp = getTimestamp()
+	    if (System.properties['ci.build'] == 'true') {
+            timestamp = "${properties.major}.${properties.minor}.${properties.micro}.D-${getDate()}"
+        } else {
+            timestamp = "${properties.major}.${properties.minor}.${properties.micro}.${getDate()}"
+	    }
+    }
 
     def getDate() {
         def date = new Date()
@@ -8,20 +18,14 @@
     }
 
     String toString() {
-	    if (System.properties['ci.build'] == 'true') {
-            return "$proj.ext.properties.major.$proj.ext.properties.minor.$proj.ext.properties.micro." + "D-" + getDate()
-        } else {
-            return "$proj.ext.properties.major.$proj.ext.properties.minor.$proj.ext.properties.micro." + getDate()
-	    }
-    }
+    	return timestamp
+	}
 }
 
 subprojects {
 
     apply plugin: 'java'
 
-    version = new Version(proj: project)
-
     ext {
         // OSGi version
     	major = '4'
@@ -33,6 +37,8 @@
         easymockVersion = '2.3' // (PB CQ1887)
     }
 
+    version = new Version(project.ext.properties)
+
     repositories {
         mavenCentral()
         ivy {
diff --git a/util b/util
index cc585f7..cae0772 160000
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit cc585f7d65205fac71b3fe61366557e0f85bc457
+Subproject commit cae077224e18129481df3d2040e5ee9a354369c4