diff --git a/.gitignore b/.gitignore
index 656f8b83d..6006a3da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.iml
+.idea
 .DS_Store
 target
 bin
diff --git a/pom.xml b/pom.xml
index 09bd70dc5..9bd2a654f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.codegen</groupId>
   <artifactId>codegen</artifactId>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <name>Codegen</name>
   <description>Code generation and compilation for Java</description>
   
diff --git a/src/main/java/com/mysema/codegen/model/TypeCategory.java b/src/main/java/com/mysema/codegen/model/TypeCategory.java
index 850bdddba..4443256d3 100644
--- a/src/main/java/com/mysema/codegen/model/TypeCategory.java
+++ b/src/main/java/com/mysema/codegen/model/TypeCategory.java
@@ -58,13 +58,15 @@ public enum TypeCategory {
     /**
      *
      */
-    DATE(COMPARABLE, java.sql.Date.class.getName(), "org.joda.time.LocalDate"),
+    DATE(COMPARABLE, java.sql.Date.class.getName(), "org.joda.time.LocalDate",
+            "java.time.LocalDate"),
     /**
      *
      */
     DATETIME(COMPARABLE, java.util.Calendar.class.getName(), java.util.Date.class.getName(),
             java.sql.Timestamp.class.getName(), "org.joda.time.LocalDateTime",
-            "org.joda.time.Instant", "org.joda.time.DateTime", "org.joda.time.DateMidnight"),
+            "org.joda.time.Instant", "org.joda.time.DateTime", "org.joda.time.DateMidnight",
+            "java.time.Instant", "java.time.LocalDateTime", "java.time.OffsetDateTime", "java.time.ZonedDateTime"),
     /**
      * 
      */
@@ -90,7 +92,8 @@ public enum TypeCategory {
     /**
      *
      */
-    TIME(COMPARABLE, java.sql.Time.class.getName(), "org.joda.time.LocalTime");
+    TIME(COMPARABLE, java.sql.Time.class.getName(), "org.joda.time.LocalTime",
+            "java.time.LocalTime", "java.time.OffsetTime");
 
     private final TypeCategory superType;
 
diff --git a/src/test/java/com/mysema/codegen/model/TypeCategoryTest.java b/src/test/java/com/mysema/codegen/model/TypeCategoryTest.java
index fb6e35a8e..2bd05d473 100644
--- a/src/test/java/com/mysema/codegen/model/TypeCategoryTest.java
+++ b/src/test/java/com/mysema/codegen/model/TypeCategoryTest.java
@@ -33,4 +33,15 @@ public class TypeCategoryTest {
         assertEquals(TypeCategory.TIME, TypeCategory.get(Time.class.getName()));
     }
 
+    @Test
+    public void Java8() {
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.Instant"));
+        assertEquals(TypeCategory.DATE, TypeCategory.get("java.time.LocalDate"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.LocalDateTime"));
+        assertEquals(TypeCategory.TIME, TypeCategory.get("java.time.LocalTime"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.OffsetDateTime"));
+        assertEquals(TypeCategory.TIME, TypeCategory.get("java.time.OffsetTime"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.ZonedDateTime"));
+    }
+
 }