diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index 0d7a824e5..3dc975f8b 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index 399d31784..3f827d754 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index 427065588..7e2157888 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-hibernate-search/pom.xml b/querydsl-hibernate-search/pom.xml
index 1d8bcbb9a..50ef7c907 100644
--- a/querydsl-hibernate-search/pom.xml
+++ b/querydsl-hibernate-search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-hql/pom.xml b/querydsl-hql/pom.xml
index 813accb94..cdec1ba23 100644
--- a/querydsl-hql/pom.xml
+++ b/querydsl-hql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-jdoql/pom.xml b/querydsl-jdoql/pom.xml
index b18765896..7c0b74d23 100644
--- a/querydsl-jdoql/pom.xml
+++ b/querydsl-jdoql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-lucene/pom.xml b/querydsl-lucene/pom.xml
index b0ab15cbf..1c1f9560f 100644
--- a/querydsl-lucene/pom.xml
+++ b/querydsl-lucene/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-maven-plugin/pom.xml b/querydsl-maven-plugin/pom.xml
index d68ec3538..a6e1387a8 100644
--- a/querydsl-maven-plugin/pom.xml
+++ b/querydsl-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index dbca7b3a2..2ce15296f 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>1.9.0-SNAPSHOT</version>
+  <version>1.9.1</version>
   <name>Querydsl</name>
   <description>parent project for querydsl modules</description>
   <url>http://source.mysema.com/display/querydsl</url>
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index d9b1d15c6..49de399b7 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.1</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataSerializer.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataSerializer.java
index 420b91371..bdda451c1 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataSerializer.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataSerializer.java
@@ -206,10 +206,10 @@ public class MetaDataSerializer extends EntitySerializer {
 
     protected void serializePrimaryKeys(EntityType model, CodeWriter writer,
             Collection<PrimaryKeyData> primaryKeys) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, true);
+//        Type queryType = typeMappings.getPathType(model, model, true);
         for (PrimaryKeyData primaryKey : primaryKeys){
             String fieldName = namingStrategy.getPropertyNameForPrimaryKey(primaryKey.getName(), model);
-            StringBuilder value = new StringBuilder("new PrimaryKey<"+queryType.getSimpleName()+">(this, ");
+            StringBuilder value = new StringBuilder("new PrimaryKey<"+model.getSimpleName()+">(this, ");
             boolean first = true;
             for (String column : primaryKey.getColumns()){
                 if (!first){
@@ -219,7 +219,7 @@ public class MetaDataSerializer extends EntitySerializer {
                 first = false;
             }
             value.append(")");
-            Type type = new ClassType(PrimaryKey.class, queryType);
+            Type type = new ClassType(PrimaryKey.class, model);
             writer.publicFinal(type, fieldName, value.toString());
         }
 
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java
index 4e0c2bbae..a9d5e96f7 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java
@@ -65,6 +65,19 @@ public class MetaDataExporterTest extends AbstractJDBCTest{
 
         statement.execute("drop table date_time_test if exists");
         statement.execute("create table date_time_test (dt datetime)");
+        
+        statement.execute("create table employee("
+                + "id INT, "
+                + "firstname VARCHAR(50), "
+                + "lastname VARCHAR(50), "
+                + "salary DECIMAL(10, 2), "
+                + "datefield DATE, "
+                + "timefield TIME, "
+                + "superior_id int, "
+                + "survey_id int, "
+                + "survey_name varchar(30), "
+                + "CONSTRAINT PK_employee PRIMARY KEY (id), "
+                + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");       
 
         MetaDataSerializer serializer = new MetaDataSerializer(namePrefix, namingStrategy);
         MetaDataExporter exporter;