diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java
new file mode 100644
index 000000000..f6aac9788
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java
@@ -0,0 +1,28 @@
+package com.mysema.query.domain;
+
+import org.junit.Ignore;
+
+import com.mysema.query.annotations.QueryEntity;
+
+@Ignore
+public class Enum2Test {
+    
+    @QueryEntity
+    public abstract class EnumPermissions<P extends Enum<P> & Permission> extends EntityImpl implements Permissions<P> {
+    
+    }
+
+    @QueryEntity
+    public abstract class EntityImpl {
+                
+    }
+
+    public interface Permission {
+        
+    }
+    
+    public interface Permissions<P> {
+        
+    }
+    
+}
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index b180589bb..13c642fb9 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -28,7 +28,7 @@
     <hsqldb.version>1.8.0.7</hsqldb.version>
     <commons.collections.version>4.01</commons.collections.version>
     <commons.lang.version>2.4</commons.lang.version>
-    <codegen.version>0.3.9</codegen.version>
+    <codegen.version>0.4.0</codegen.version>
     <mysema.lang.version>0.2.1</mysema.lang.version>
     <cglib.version>2.2</cglib.version>    
     <findbugs.version>1.3.2</findbugs.version>