diff --git a/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
index 93e6fc3d..56e6abad 100644
--- a/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article-spring20/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18881" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties b/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
index 8ae3f6be..b635ac60 100644
--- a/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article-spring20/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18881
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring20/src/test/resources/config/ldap.properties b/samples/article-spring20/src/test/resources/config/ldap.properties
index 8ae3f6be..b635ac60 100644
--- a/samples/article-spring20/src/test/resources/config/ldap.properties
+++ b/samples/article-spring20/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18881
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring20/src/test/resources/config/testContext.xml b/samples/article-spring20/src/test/resources/config/testContext.xml
index f21d3331..2a095c85 100644
--- a/samples/article-spring20/src/test/resources/config/testContext.xml
+++ b/samples/article-spring20/src/test/resources/config/testContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18881" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:1888" />
+		<property name="url" value="ldap://localhost:18881" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
index 93e6fc3d..99bd0f62 100644
--- a/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article-spring30/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,9 +15,9 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18882" />
 	</bean>
-
+z
 	<bean id="ldapTemplate"
 		class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
diff --git a/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties b/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
index 8ae3f6be..0b55d000 100644
--- a/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article-spring30/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18882
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring30/src/test/resources/config/ldap.properties b/samples/article-spring30/src/test/resources/config/ldap.properties
index 8ae3f6be..0b55d000 100644
--- a/samples/article-spring30/src/test/resources/config/ldap.properties
+++ b/samples/article-spring30/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18882
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article-spring30/src/test/resources/config/testContext.xml b/samples/article-spring30/src/test/resources/config/testContext.xml
index f21d3331..5be8becf 100644
--- a/samples/article-spring30/src/test/resources/config/testContext.xml
+++ b/samples/article-spring30/src/test/resources/config/testContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18882" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:1888" />
+		<property name="url" value="ldap://localhost:18882" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/article/src/main/webapp/WEB-INF/applicationContext.xml b/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
index 93e6fc3d..1de82441 100644
--- a/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/WEB-INF/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18880" />
 	</bean>
 
 	<bean id="ldapTemplate"
diff --git a/samples/article/src/main/webapp/WEB-INF/ldap.properties b/samples/article/src/main/webapp/WEB-INF/ldap.properties
index 8ae3f6be..58dd2aab 100644
--- a/samples/article/src/main/webapp/WEB-INF/ldap.properties
+++ b/samples/article/src/main/webapp/WEB-INF/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18880
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article/src/test/resources/config/ldap.properties b/samples/article/src/test/resources/config/ldap.properties
index 8ae3f6be..58dd2aab 100644
--- a/samples/article/src/test/resources/config/ldap.properties
+++ b/samples/article/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18880
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/article/src/test/resources/config/testContext.xml b/samples/article/src/test/resources/config/testContext.xml
index f21d3331..0ee3cee6 100644
--- a/samples/article/src/test/resources/config/testContext.xml
+++ b/samples/article/src/test/resources/config/testContext.xml
@@ -15,7 +15,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18880" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
@@ -29,7 +29,7 @@
 
 	<bean id="traditionalPersonDao"
 		class="org.springframework.ldap.samples.article.dao.TraditionalPersonDaoImpl">
-		<property name="url" value="ldap://localhost:1888" />
+		<property name="url" value="ldap://localhost:18880" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/demos/demo-tiger/src/test/resources/config/ldap.properties b/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
index 8ae3f6be..a8475efd 100644
--- a/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
+++ b/samples/demos/demo-tiger/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18884
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/demos/demo-tiger/src/test/resources/config/testContext.xml b/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
index 095a8c0e..f68de5ee 100644
--- a/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
+++ b/samples/demos/demo-tiger/src/test/resources/config/testContext.xml
@@ -14,14 +14,14 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18884" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
 		<property name="base" value="dc=jayway,dc=se" />
-		<property name="url" value="ldap://localhost:1888" />
+		<property name="url" value="ldap://localhost:18884" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 	</bean>
diff --git a/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml b/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
index 2c9dd28a..2fd6b3ff 100644
--- a/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
+++ b/samples/demos/demo/src/main/java/org/springframework/ldap/demo/solution/testContext.xml
@@ -14,13 +14,13 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18883" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
-		<property name="url" value="ldap://127.0.0.1:1888" />
+		<property name="url" value="ldap://127.0.0.1:18883" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/samples/demos/demo/src/test/resources/config/ldap.properties b/samples/demos/demo/src/test/resources/config/ldap.properties
index 8ae3f6be..aa373cb1 100644
--- a/samples/demos/demo/src/test/resources/config/ldap.properties
+++ b/samples/demos/demo/src/test/resources/config/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18883
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/demos/demo/src/test/resources/config/testContext.xml b/samples/demos/demo/src/test/resources/config/testContext.xml
index 095a8c0e..23a74dab 100644
--- a/samples/demos/demo/src/test/resources/config/testContext.xml
+++ b/samples/demos/demo/src/test/resources/config/testContext.xml
@@ -14,14 +14,14 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="/config/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18883" />
 	</bean>
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
 		<constructor-arg ref="contextSource" />
 	</bean>
 	<bean id="personDao" class="org.springframework.ldap.demo.dao.PersonDaoImpl">
 		<property name="base" value="dc=jayway,dc=se" />
-		<property name="url" value="ldap://localhost:1888" />
+		<property name="url" value="ldap://localhost:18883" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 	</bean>
diff --git a/samples/samples-utils/src/test/resources/conf/ldap.properties b/samples/samples-utils/src/test/resources/conf/ldap.properties
index 8ae3f6be..992a6279 100644
--- a/samples/samples-utils/src/test/resources/conf/ldap.properties
+++ b/samples/samples-utils/src/test/resources/conf/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:1888
+urls=ldap://127.0.0.1:18885
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/samples/samples-utils/src/test/resources/conf/testContext.xml b/samples/samples-utils/src/test/resources/conf/testContext.xml
index 0ddf149a..196da0b9 100644
--- a/samples/samples-utils/src/test/resources/conf/testContext.xml
+++ b/samples/samples-utils/src/test/resources/conf/testContext.xml
@@ -12,7 +12,7 @@
 		<property name="principal" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="ldifFile" value="classpath:/setup_data.ldif" />
-		<property name="port" value="1888" />
+		<property name="port" value="18885" />
 	</bean>
 
 	<bean id="ldapTemplate"