diff --git a/spring-ldap/src/itest/java/conf/ldapTemplateObjectBindTestContext.xml b/spring-ldap/src/itest/java/conf/ldapTemplateObjectBindTestContext.xml
new file mode 100644
index 00000000..b1c6f344
--- /dev/null
+++ b/spring-ldap/src/itest/java/conf/ldapTemplateObjectBindTestContext.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+    <import resource="classpath:/conf/apacheDsContext.xml"/>
+    <import resource="classpath:/conf/commonTestContext.xml"/>
+	
+	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
+		<property name="urls" value="${urls}" />
+		<property name="userDn" value="${userDn}" />
+		<property name="password" value="${password}" />
+		<property name="base" value="${base}" />
+		<property name="dirObjectFactory"><null /></property>
+	</bean>
+	
+	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
+		<constructor-arg ref="contextSource" />
+	</bean>
+	
+</beans>
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
index d8a3f0ab..0956506e 100644
--- a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
@@ -18,12 +18,14 @@ package org.springframework.ldap;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
+import javax.naming.spi.DirObjectFactory;
 
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.support.AbstractContextSource;
 
 /**
  * Tests the lookup methods of LdapTemplate.
@@ -31,192 +33,190 @@ import org.springframework.ldap.core.LdapTemplate;
  * @author Mattias Arthursson
  * @author Ulrik Sandberg
  */
-public class LdapTemplateLookupITest extends
-        AbstractLdapTemplateIntegrationTest {
+public class LdapTemplateLookupITest extends AbstractLdapTemplateIntegrationTest {
 
-    private LdapTemplate tested;
+	private LdapTemplate tested;
 
-    protected String[] getConfigLocations() {
-        return new String[] { "/conf/ldapTemplateTestContext.xml" };
-    }
+	protected String[] getConfigLocations() {
+		return new String[] { "/conf/ldapTemplateTestContext.xml" };
+	}
 
-    /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
-     * being set in the ContextSource.
-     */
-    public void testLookup_Plain() {
-        DirContextAdapter result = (DirContextAdapter) tested
-                .lookup("cn=Some Person2, ou=company1,c=Sweden");
+	/**
+	 * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
+	 * being set in the ContextSource.
+	 */
+	public void testLookup_Plain() {
+		DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person2, ou=company1,c=Sweden");
 
-        assertEquals("Some Person2", result.getStringAttribute("cn"));
-        assertEquals("Person2", result.getStringAttribute("sn"));
-        assertEquals("Sweden, Company1, Some Person2", result
-                .getStringAttribute("description"));
-    }
+		assertEquals("Some Person2", result.getStringAttribute("cn"));
+		assertEquals("Person2", result.getStringAttribute("sn"));
+		assertEquals("Sweden, Company1, Some Person2", result.getStringAttribute("description"));
+	}
 
-    public void testLookup_AttributesMapper() {
-        AttributesMapper mapper = new PersonAttributesMapper();
-        Person person = (Person) tested.lookup(
-                "cn=Some Person2, ou=company1,c=Sweden", mapper);
+	public void testLookup_AttributesMapper() {
+		AttributesMapper mapper = new PersonAttributesMapper();
+		Person person = (Person) tested.lookup("cn=Some Person2, ou=company1,c=Sweden", mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertEquals("Person2", person.getLastname());
-        assertEquals("Sweden, Company1, Some Person2", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertEquals("Person2", person.getLastname());
+		assertEquals("Sweden, Company1, Some Person2", person.getDescription());
+	}
 
-    public void testLookup_AttributesMapper_DistinguishedName() {
-        AttributesMapper mapper = new PersonAttributesMapper();
-        Person person = (Person) tested.lookup(new DistinguishedName(
-                "cn=Some Person2, ou=company1,c=Sweden"), mapper);
+	public void testLookup_AttributesMapper_DistinguishedName() {
+		AttributesMapper mapper = new PersonAttributesMapper();
+		Person person = (Person) tested.lookup(new DistinguishedName("cn=Some Person2, ou=company1,c=Sweden"), mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertEquals("Person2", person.getLastname());
-        assertEquals("Sweden, Company1, Some Person2", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertEquals("Person2", person.getLastname());
+		assertEquals("Sweden, Company1, Some Person2", person.getDescription());
+	}
 
-    /**
-     * An {@link AttributesMapper} that only maps a subset of the full
-     * attributes list. Used in tests where the return attributes list has been
-     * limited.
-     * 
-     * @author Ulrik Sandberg
-     */
-    private final class SubsetPersonAttributesMapper implements
-            AttributesMapper {
-        /**
-         * Maps the <code>cn</code> attribute into a {@link Person} object.
-         * Also verifies that the other attributes haven't been set.
-         * 
-         * @see org.springframework.ldap.core.AttributesMapper#mapFromAttributes(javax.naming.directory.Attributes)
-         */
-        public Object mapFromAttributes(Attributes attributes)
-                throws NamingException {
-            Person person = new Person();
-            person.setFullname((String) attributes.get("cn").get());
-            assertNull("sn should be null", attributes.get("sn"));
-            assertNull("description should be null", attributes
-                    .get("description"));
-            return person;
-        }
-    }
+	/**
+	 * An {@link AttributesMapper} that only maps a subset of the full
+	 * attributes list. Used in tests where the return attributes list has been
+	 * limited.
+	 * 
+	 * @author Ulrik Sandberg
+	 */
+	private final class SubsetPersonAttributesMapper implements AttributesMapper {
+		/**
+		 * Maps the <code>cn</code> attribute into a {@link Person} object.
+		 * Also verifies that the other attributes haven't been set.
+		 * 
+		 * @see org.springframework.ldap.core.AttributesMapper#mapFromAttributes(javax.naming.directory.Attributes)
+		 */
+		public Object mapFromAttributes(Attributes attributes) throws NamingException {
+			Person person = new Person();
+			person.setFullname((String) attributes.get("cn").get());
+			assertNull("sn should be null", attributes.get("sn"));
+			assertNull("description should be null", attributes.get("description"));
+			return person;
+		}
+	}
 
-    /**
-     * Verifies that only the subset is used when specifying a subset of the
-     * available attributes as return attributes.
-     */
-    public void testLookup_ReturnAttributes_AttributesMapper() {
-        AttributesMapper mapper = new SubsetPersonAttributesMapper();
+	/**
+	 * Verifies that only the subset is used when specifying a subset of the
+	 * available attributes as return attributes.
+	 */
+	public void testLookup_ReturnAttributes_AttributesMapper() {
+		AttributesMapper mapper = new SubsetPersonAttributesMapper();
 
-        Person person = (Person) tested.lookup(
-                "cn=Some Person2, ou=company1,c=Sweden", new String[] { "cn" },
-                mapper);
+		Person person = (Person) tested.lookup("cn=Some Person2, ou=company1,c=Sweden", new String[] { "cn" }, mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertNull("lastName should not be set", person.getLastname());
-        assertNull("description should not be set", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertNull("lastName should not be set", person.getLastname());
+		assertNull("description should not be set", person.getDescription());
+	}
 
-    /**
-     * Verifies that only the subset is used when specifying a subset of the
-     * available attributes as return attributes. Uses DistinguishedName instead
-     * of plain string as name.
-     */
-    public void testLookup_ReturnAttributes_AttributesMapper_DistinguishedName() {
-        AttributesMapper mapper = new SubsetPersonAttributesMapper();
-        Person person = (Person) tested.lookup(new DistinguishedName(
-                "cn=Some Person2, ou=company1,c=Sweden"),
-                new String[] { "cn" }, mapper);
+	/**
+	 * Verifies that only the subset is used when specifying a subset of the
+	 * available attributes as return attributes. Uses DistinguishedName instead
+	 * of plain string as name.
+	 */
+	public void testLookup_ReturnAttributes_AttributesMapper_DistinguishedName() {
+		AttributesMapper mapper = new SubsetPersonAttributesMapper();
+		Person person = (Person) tested.lookup(new DistinguishedName("cn=Some Person2, ou=company1,c=Sweden"),
+				new String[] { "cn" }, mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertNull("lastName should not be set", person.getLastname());
-        assertNull("description should not be set", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertNull("lastName should not be set", person.getLastname());
+		assertNull("description should not be set", person.getDescription());
+	}
 
-    /**
-     * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
-     * being set in the ContextSource.
-     */
-    public void testLookup_ContextMapper() {
-        ContextMapper mapper = new PersonContextMapper();
-        Person person = (Person) tested.lookup(
-                "cn=Some Person2, ou=company1,c=Sweden", mapper);
+	/**
+	 * This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
+	 * being set in the ContextSource.
+	 */
+	public void testLookup_ContextMapper() {
+		ContextMapper mapper = new PersonContextMapper();
+		Person person = (Person) tested.lookup("cn=Some Person2, ou=company1,c=Sweden", mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertEquals("Person2", person.getLastname());
-        assertEquals("Sweden, Company1, Some Person2", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertEquals("Person2", person.getLastname());
+		assertEquals("Sweden, Company1, Some Person2", person.getDescription());
+	}
 
-    /**
-     * Verifies that only the subset is used when specifying a subset of the
-     * available attributes as return attributes.
-     */
-    public void testLookup_ReturnAttributes_ContextMapper() {
-        ContextMapper mapper = new PersonContextMapper();
+	/**
+	 * Verifies that only the subset is used when specifying a subset of the
+	 * available attributes as return attributes.
+	 */
+	public void testLookup_ReturnAttributes_ContextMapper() {
+		ContextMapper mapper = new PersonContextMapper();
 
-        Person person = (Person) tested.lookup(
-                "cn=Some Person2, ou=company1,c=Sweden", new String[] { "cn" },
-                mapper);
+		Person person = (Person) tested.lookup("cn=Some Person2, ou=company1,c=Sweden", new String[] { "cn" }, mapper);
 
-        assertEquals("Some Person2", person.getFullname());
-        assertNull("lastName should not be set", person.getLastname());
-        assertNull("description should not be set", person.getDescription());
-    }
+		assertEquals("Some Person2", person.getFullname());
+		assertNull("lastName should not be set", person.getLastname());
+		assertNull("description should not be set", person.getDescription());
+	}
 
-    /**
-     * Verifies that we can lookup an entry that has a multi-valued rdn, which
-     * means more than one attribute is part of the relative DN for the entry.
-     * 
-     * TODO Enable test when ApacheDS supports multi-valued rdns.
-     */
-    public void DISABLED_testLookup_MultiValuedRdn() {
-        AttributesMapper mapper = new PersonAttributesMapper();
-        Person person = (Person) tested.lookup(
-                "cn=Some Person+sn=Person, ou=company1,c=Norway", mapper);
+	/**
+	 * Verifies that we can lookup an entry that has a multi-valued rdn, which
+	 * means more than one attribute is part of the relative DN for the entry.
+	 * 
+	 * TODO Enable test when ApacheDS supports multi-valued rdns.
+	 */
+	public void DISABLED_testLookup_MultiValuedRdn() {
+		AttributesMapper mapper = new PersonAttributesMapper();
+		Person person = (Person) tested.lookup("cn=Some Person+sn=Person, ou=company1,c=Norway", mapper);
 
-        assertEquals("Some Person", person.getFullname());
-        assertEquals("Person", person.getLastname());
-        assertEquals("Norway, Company1, Some Person2", person.getDescription());
-    }
+		assertEquals("Some Person", person.getFullname());
+		assertEquals("Person", person.getLastname());
+		assertEquals("Norway, Company1, Some Person2", person.getDescription());
+	}
 
-    /**
-     * Verifies that we can lookup an entry that has a multi-valued rdn, which
-     * means more than one attribute is part of the relative DN for the entry.
-     * 
-     * TODO Enable test when ApacheDS supports multi-valued rdns.
-     */
-    public void DISABLED_testLookup_MultiValuedRdn_DirContextAdapter() {
-        DirContextAdapter result = (DirContextAdapter) tested
-                .lookup("cn=Some Person+sn=Person, ou=company1,c=Norway");
+	/**
+	 * Verifies that we can lookup an entry that has a multi-valued rdn, which
+	 * means more than one attribute is part of the relative DN for the entry.
+	 * 
+	 * TODO Enable test when ApacheDS supports multi-valued rdns.
+	 */
+	public void DISABLED_testLookup_MultiValuedRdn_DirContextAdapter() {
+		DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person+sn=Person, ou=company1,c=Norway");
 
-        assertEquals("Some Person", result.getStringAttribute("cn"));
-        assertEquals("Person", result.getStringAttribute("sn"));
-        assertEquals("Norway, Company1, Some Person", result
-                .getStringAttribute("description"));
-    }
+		assertEquals("Some Person", result.getStringAttribute("cn"));
+		assertEquals("Person", result.getStringAttribute("sn"));
+		assertEquals("Norway, Company1, Some Person", result.getStringAttribute("description"));
+	}
 
-    public void testLookup_GetNameInNamespace_Plain() {
-        DirContextAdapter result = (DirContextAdapter) tested
-                .lookup("cn=Some Person2, ou=company1,c=Sweden");
+	public void testLookup_GetNameInNamespace_Plain() {
+		DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person2, ou=company1,c=Sweden");
 
-        assertEquals("cn=Some Person2, ou=company1, c=Sweden", result.getDn()
-                .toString());
-        assertEquals(
-                "cn=Some Person2, ou=company1, c=Sweden, dc=jayway, dc=se",
-                result.getNameInNamespace());
-    }
+		assertEquals("cn=Some Person2, ou=company1, c=Sweden", result.getDn().toString());
+		assertEquals("cn=Some Person2, ou=company1, c=Sweden, dc=jayway, dc=se", result.getNameInNamespace());
+	}
 
-    public void testLookup_GetNameInNamespace_MultiRdn() {
-        DirContextAdapter result = (DirContextAdapter) tested
-                .lookup("cn=Some Person+sn=Person, ou=company1,c=Norway");
+	public void testLookup_GetNameInNamespace_MultiRdn() {
+		DirContextAdapter result = (DirContextAdapter) tested.lookup("cn=Some Person+sn=Person, ou=company1,c=Norway");
 
-        assertEquals("cn=Some Person+sn=Person, ou=company1, c=Norway", result
-                .getDn().toString());
-        assertEquals(
-                "cn=Some Person+sn=Person, ou=company1, c=Norway, dc=jayway, dc=se",
-                result.getNameInNamespace());
-    }
+		assertEquals("cn=Some Person+sn=Person, ou=company1, c=Norway", result.getDn().toString());
+		assertEquals("cn=Some Person+sn=Person, ou=company1, c=Norway, dc=jayway, dc=se", result.getNameInNamespace());
+	}
 
-    public void setTested(LdapTemplate tested) {
-        this.tested = tested;
-    }
+	/**
+	 * Tests bind and lookup with Java objects where the ContextSource already
+	 * has a DirObjectFactory configured.
+	 */
+	public void testBindJavaObject() throws Exception {
+		AbstractContextSource contextSource = (AbstractContextSource) tested.getContextSource();
+		Class<? extends DirObjectFactory> originalObjectFactory = contextSource.getDirObjectFactory();
+		try {
+			contextSource.setDirObjectFactory(null);
+			contextSource.afterPropertiesSet();
+			Integer i = new Integer(54321);
+			tested.bind("cn=myRandomInt", i, null);
+			i = new Integer(12345);
+			i = (Integer) tested.lookup("cn=myRandomInt");
+			assertEquals(54321, i.intValue());
+		}
+		finally {
+			// reset the DirObjectFactory so as not to disturb other tests
+			contextSource.setDirObjectFactory(originalObjectFactory);
+			contextSource.afterPropertiesSet();
+		}
+	}
+
+	public void setTested(LdapTemplate tested) {
+		this.tested = tested;
+	}
 }
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java
new file mode 100644
index 00000000..e0f7d030
--- /dev/null
+++ b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateObjectBindIntegrationTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2005-2007 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ldap;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+import javax.naming.directory.DirContext;
+
+import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.core.support.AbstractContextSource;
+
+/**
+ * Tests bind and lookup with Java objects where the ContextSource has a
+ * <code>null</code> DirObjectFactory configured.
+ * 
+ * @author Ulrik Sandberg
+ */
+public class LdapTemplateObjectBindIntegrationTest extends AbstractLdapTemplateIntegrationTest {
+
+	private LdapTemplate tested;
+
+	protected String[] getConfigLocations() {
+		return new String[] { "/conf/ldapTemplateObjectBindTestContext.xml" };
+	}
+
+	public void testBindJavaObject() throws Exception {
+		tested.bind("cn=myRandomInt", new Integer(54321), null);
+
+		Integer result = (Integer) tested.lookup("cn=myRandomInt");
+		assertEquals(54321, result.intValue());
+	}
+
+	@SuppressWarnings("unchecked")
+	public void testBindLinkedList() {
+		LinkedList<Integer> list = new LinkedList<Integer>();
+		list.add(54321);
+		list.add(67890);
+
+		tested.bind("cn=myRandomList", list, null);
+
+		LinkedList<Integer> result = (LinkedList<Integer>) tested.lookup("cn=myRandomList");
+		assertEquals(2, result.size());
+		assertEquals(54321, result.get(0).intValue());
+		assertEquals(67890, result.get(1).intValue());
+	}
+
+	public void testBindNonSerializableJavaObjectShouldFail() throws Exception {
+		NonSerializablePojo pojo = new NonSerializablePojo();
+		pojo.setName("A Name");
+
+		try {
+			tested.bind("cn=myRandomObject", pojo, null);
+			fail("IllegalArgumentException expected");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("can only bind Referenceable, Serializable, DirContext", expected.getMessage());
+		}
+	}
+
+	/**
+	 * Custom non-serializable class used for demonstrating bind and lookup of
+	 * Java objects.
+	 */
+	public static class NonSerializablePojo {
+		private String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	public void testBindSerializableJavaObjectShouldSucceed() throws Exception {
+		SerializablePojo pojo = new SerializablePojo();
+		pojo.setName("A Name");
+
+		tested.bind("cn=myRandomObject", pojo, null);
+
+		SerializablePojo result = (SerializablePojo) tested.lookup("cn=myRandomObject");
+		assertEquals("A Name", result.getName());
+	}
+
+	/**
+	 * Custom serializable class used for demonstrating bind and lookup of Java
+	 * objects.
+	 */
+	public static class SerializablePojo implements Serializable {
+		private static final long serialVersionUID = 3655768927093734908L;
+
+		private String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	/**
+	 * This test demonstrates that it's fully possible to perform plain JNDI
+	 * operations from Spring LDAP.
+	 */
+	public void testPlainJndiBindJavaObject() throws Exception {
+		AbstractContextSource contextSource = (AbstractContextSource) tested.getContextSource();
+		DirContext ctx = contextSource.getReadWriteContext();
+
+		ctx.bind("cn=myRandomInt", new Integer(28420));
+
+		Integer result = (Integer) ctx.lookup("cn=myRandomInt");
+		assertEquals(28420, result.intValue());
+	}
+
+	public void setTested(LdapTemplate tested) {
+		this.tested = tested;
+	}
+}