diff --git a/querydsl-hql/pom.xml b/querydsl-hql/pom.xml
index 96950edfd..149787043 100644
--- a/querydsl-hql/pom.xml
+++ b/querydsl-hql/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.3.10-SNAPSHOT</version>
+    <version>0.3.11-SNAPSHOT</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-apt</artifactId>
+      <artifactId>querydsl-apt-jdk5</artifactId>
       <version>${project.parent.version}</version>
       <scope>provided</scope>
       <!-- license : TODO -->
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java b/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java
new file mode 100644
index 000000000..3d0e3f99f
--- /dev/null
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
+
+/**
+ * HQL for Hibernate
+ */
+package com.mysema.query.hql.hibernate;
+
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQuery.java
new file mode 100644
index 000000000..b92518106
--- /dev/null
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQuery.java
@@ -0,0 +1,45 @@
+package com.mysema.query.hql.jpa;
+
+import com.mysema.query.Projectable;
+import com.mysema.query.QueryModifiers;
+import com.mysema.query.types.OrderSpecifier;
+import com.mysema.query.types.expr.EBoolean;
+import com.mysema.query.types.expr.EEntity;
+import com.mysema.query.types.expr.Expr;
+import com.mysema.query.types.path.PEntity;
+
+/**
+ * 
+ * 
+ * @author tiwe
+ *
+ */
+public interface JPAQLQuery extends Projectable{
+    
+    JPAQLQuery from(PEntity<?>... o);
+
+    JPAQLQuery innerJoin(EEntity<?> target, PEntity<?> alias);
+    
+    JPAQLQuery join(EEntity<?> target, PEntity<?> alias);
+    
+    JPAQLQuery fullJoin(EEntity<?> target, PEntity<?> alias);
+    
+    JPAQLQuery leftJoin(EEntity<?> target, PEntity<?> alias);
+    
+    JPAQLQuery on(EBoolean cond);
+    
+    JPAQLQuery groupBy(Expr<?>... e);
+    
+    JPAQLQuery having(EBoolean... cond);
+    
+    JPAQLQuery where(EBoolean... o);
+    
+    JPAQLQuery orderBy(OrderSpecifier<?>... o);
+        
+    JPAQLQuery limit(long limit);
+
+    JPAQLQuery offset(long offset);
+
+    JPAQLQuery restrict(QueryModifiers mod);
+
+}
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQueryImpl.java b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQueryImpl.java
index a8c176b7e..fee2e9473 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQueryImpl.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQLQueryImpl.java
@@ -27,7 +27,7 @@ import com.mysema.query.types.expr.Expr;
  * @author tiwe
  *
  */
-public class JPAQLQueryImpl extends HQLQueryBase<JPAQLQueryImpl> {
+public class JPAQLQueryImpl extends HQLQueryBase<JPAQLQueryImpl> implements JPAQLQuery{
 
     private static final Logger logger = LoggerFactory.getLogger(JPAQLQueryImpl.class);
 
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java
new file mode 100644
index 000000000..5d7db3771
--- /dev/null
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2009 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
+
+/**
+ * HQL for JPA
+ */
+package com.mysema.query.hql.jpa;
+