diff --git a/jpa/example/pom.xml b/jpa/example/pom.xml
index bf943ea7..00aaa9da 100644
--- a/jpa/example/pom.xml
+++ b/jpa/example/pom.xml
@@ -13,9 +13,6 @@
 
 	<name>Spring Data JPA - Example</name>
 	<description>Small sample project showing the usage of Spring Data JPA.</description>
-	<properties>
-		<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
 
 	<build>
 		<plugins>
@@ -31,4 +28,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/jpa/showcase/pom.xml b/jpa/showcase/pom.xml
index 8cde63b8..116db613 100644
--- a/jpa/showcase/pom.xml
+++ b/jpa/showcase/pom.xml
@@ -81,7 +81,7 @@
 			<dependencies>
 
 				<dependency>
-					<groupId>com.mysema.querydsl</groupId>
+					<groupId>com.querydsl</groupId>
 					<artifactId>querydsl-jpa</artifactId>
 					<version>${querydsl.version}</version>
 				</dependency>
@@ -96,7 +96,7 @@
 						<version>${apt.version}</version>
 						<dependencies>
 							<dependency>
-								<groupId>com.mysema.querydsl</groupId>
+								<groupId>com.querydsl</groupId>
 								<artifactId>querydsl-apt</artifactId>
 								<version>${querydsl.version}</version>
 							</dependency>
@@ -109,7 +109,7 @@
 								</goals>
 								<configuration>
 									<outputDirectory>target/generated-sources/queries</outputDirectory>
-									<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+									<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
 									<logOnlyOnError>true</logOnlyOnError>
 								</configuration>
 							</execution>
diff --git a/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java b/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java
index 57c9e932..4a86b81c 100644
--- a/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java
+++ b/jpa/showcase/src/snippets/java/example/springdata/jpa/showcase/snippets/AccountPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package example.springdata.jpa.showcase.snippets;
 
-import org.joda.time.LocalDate;
-
-import com.mysema.query.types.expr.BooleanExpression;
-
 import example.springdata.jpa.showcase.core.Account;
 import example.springdata.jpa.showcase.core.QAccount;
 
+import org.joda.time.LocalDate;
+
+import com.querydsl.core.types.dsl.BooleanExpression;
+
 /**
  * Predicates for {@link Account}s.
  * 
diff --git a/mongodb/example/pom.xml b/mongodb/example/pom.xml
index 5c3bebda..4f3e62df 100644
--- a/mongodb/example/pom.xml
+++ b/mongodb/example/pom.xml
@@ -42,4 +42,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index da094013..b5efee00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,8 @@
 
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
-		<querydsl.version>3.6.9</querydsl.version>
+		<querydsl.version>4.0.8</querydsl.version>
+		<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
 
 	</properties>
 
diff --git a/rest/starbucks/pom.xml b/rest/starbucks/pom.xml
index dd0d129f..c4dac0b5 100644
--- a/rest/starbucks/pom.xml
+++ b/rest/starbucks/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 		</dependency>
@@ -102,7 +102,7 @@
 				<version>${apt.version}</version>
 				<dependencies>
 					<dependency>
-						<groupId>com.mysema.querydsl</groupId>
+						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
 					</dependency>
diff --git a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java
index ffc87cb5..d87c680c 100644
--- a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java
+++ b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreInitializer.java
@@ -15,12 +15,12 @@
  */
 package example.springdata.rest.stores;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
-import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
diff --git a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java
index 3bd713b5..169dc2ce 100644
--- a/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java
+++ b/rest/starbucks/src/main/java/example/springdata/rest/stores/StoreRepository.java
@@ -20,12 +20,11 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
-import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
 import org.springframework.data.querydsl.binding.QuerydslBindings;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.rest.core.annotation.RestResource;
 
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.dsl.StringPath;
 
 /**
  * Repository interface for out-of-the-box paginating access to {@link Store}s and a query method to find stores by
@@ -33,8 +32,7 @@ import com.mysema.query.types.path.StringPath;
  * 
  * @author Oliver Gierke
  */
-public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store>,
-		QuerydslBinderCustomizer<QStore> {
+public interface StoreRepository extends PagingAndSortingRepository<Store, String>, QueryDslPredicateExecutor<Store> {
 
 	@RestResource(rel = "by-location")
 	Page<Store> findByAddressLocationNear(Point location, Distance distance, Pageable pageable);
diff --git a/rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java b/rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java
index 1eb3232d..19e3d1fc 100644
--- a/rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java
+++ b/rest/starbucks/src/main/java/example/springdata/rest/stores/web/StoresController.java
@@ -19,6 +19,7 @@ import static org.springframework.data.geo.Metrics.*;
 
 import example.springdata.rest.stores.Store;
 import example.springdata.rest.stores.StoreRepository;
+import lombok.RequiredArgsConstructor;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,8 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import lombok.RequiredArgsConstructor;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/rest/uri-customization/pom.xml b/rest/uri-customization/pom.xml
index 3e4522ee..124c6d62 100644
--- a/rest/uri-customization/pom.xml
+++ b/rest/uri-customization/pom.xml
@@ -12,10 +12,6 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
diff --git a/web/querydsl/pom.xml b/web/querydsl/pom.xml
index d060ef01..68edf2d8 100644
--- a/web/querydsl/pom.xml
+++ b/web/querydsl/pom.xml
@@ -25,7 +25,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 		</dependency>
@@ -87,7 +87,7 @@
 				<version>${apt.version}</version>
 				<dependencies>
 					<dependency>
-						<groupId>com.mysema.querydsl</groupId>
+						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
 					</dependency>