Index: /home/markoc/projects/jcr-mapping/src/java/org/apache/portals/graffito/jcr/persistence/atomictypeconverter/impl/UtilDateTypeConverterImpl.java
===================================================================
--- /home/markoc/projects/jcr-mapping/src/java/org/apache/portals/graffito/jcr/persistence/atomictypeconverter/impl/UtilDateTypeConverterImpl.java	(revision 326592)
+++ /home/markoc/projects/jcr-mapping/src/java/org/apache/portals/graffito/jcr/persistence/atomictypeconverter/impl/UtilDateTypeConverterImpl.java	(working copy)
@@ -17,6 +17,7 @@
 
 package org.apache.portals.graffito.jcr.persistence.atomictypeconverter.impl;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import javax.jcr.RepositoryException;
@@ -54,7 +55,10 @@
 		{
 			return null;
 		}
-		return this.getValueFactory().createValue(((java.util.Date) propValue).getTime());
+		final long timeInMilis = ((java.util.Date) propValue).getTime();
+        final Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(timeInMilis);
+        return this.getValueFactory().createValue(  calendar  );
 	}