--- a/VersionInfo.st	Fri Nov 18 16:03:24 2016 +0100
+++ b/VersionInfo.st	Fri Nov 18 16:03:40 2016 +0100
@@ -14,7 +14,7 @@
 "{ NameSpace: Smalltalk }"
 
 Object subclass:#VersionInfo
-	instanceVariableNames:'revision binaryRevision user date time fileName'
+	instanceVariableNames:'revision binaryRevision user timestamp date time fileName'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'System-SourceCodeManagement'
@@ -116,6 +116,7 @@
 !
 
 date
+    timestamp notNil ifTrue:[^ timestamp asDate].
     ^ date
 !
 
@@ -199,6 +200,7 @@
 !
 
 time
+    timestamp notNil ifTrue:[^ timestamp asTime].
     ^ time
 !
 
@@ -214,12 +216,14 @@
 !
 
 timestamp
+    timestamp notNil ifTrue:[^ timestamp].
+    date isNil ifTrue:[^ nil].
+    time isNil ifTrue:[^ date asTimestamp].
     ^ Timestamp fromDate:date andTime:time
 !
 
 timestamp:aTimestamp
-    date := aTimestamp asDate.
-    time := aTimestamp asTime.
+    timestamp := aTimestamp
 
     "Created: / 04-12-2011 / 10:06:02 / cg"
 !