diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java
new file mode 100644
index 0000000000..326e419cf6
--- /dev/null
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2012-2014 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.boot.autoconfigure.dao;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring's persistence exception
+ * translation
+ *
+ * @author Andy Wilkinson
+ */
+@ConditionalOnClass(PersistenceExceptionTranslationPostProcessor.class)
+public class PersistenceExceptionTranslationAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(PersistenceExceptionTranslationPostProcessor.class)
+	public PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor() {
+		return new PersistenceExceptionTranslationPostProcessor();
+	}
+
+}
diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
index da5ccd5584..6a41d4929f 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -10,6 +10,7 @@ org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration,\
 org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration,\
 org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration,\
 org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration,\
+org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration,\
 org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration,\
 org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration,\
 org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration,\
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java
new file mode 100644
index 0000000000..6017323f3c
--- /dev/null
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2012-2014 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.boot.autoconfigure.dao;
+
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.stereotype.Repository;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ *
+ * Tests for {@link PersistenceExceptionTranslationAutoConfiguration}
+ *
+ * @author Andy Wilkinson
+ */
+public class PersistenceExceptionTranslationAutoConfigurationTests {
+
+	private AnnotationConfigApplicationContext context;
+
+	@After
+	public void close() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void exceptionTranslationPostProcessorBeanIsCreated() {
+		this.context = new AnnotationConfigApplicationContext(
+				PersistenceExceptionTranslationAutoConfiguration.class);
+		Map<String, PersistenceExceptionTranslationPostProcessor> beans = this.context
+				.getBeansOfType(PersistenceExceptionTranslationPostProcessor.class);
+		assertThat(beans.size(), is(equalTo(1)));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation() {
+		this.context = new AnnotationConfigApplicationContext(
+				EmbeddedDataSourceConfiguration.class,
+				HibernateJpaAutoConfiguration.class, TestConfiguration.class);
+		this.context.getBean(TestRepository.class).doSomething();
+	}
+
+	@Test(expected = InvalidDataAccessApiUsageException.class)
+	public void persistOfNullThrowsInvalidDataAccessApiUsageExceptionWithExceptionTranslation() {
+		this.context = new AnnotationConfigApplicationContext(
+				EmbeddedDataSourceConfiguration.class,
+				HibernateJpaAutoConfiguration.class, TestConfiguration.class,
+				PersistenceExceptionTranslationAutoConfiguration.class);
+		this.context.getBean(TestRepository.class).doSomething();
+	}
+
+	@Configuration
+	static class TestConfiguration {
+
+		@Bean
+		public TestRepository testRepository(EntityManagerFactory entityManagerFactory) {
+			return new TestRepository(entityManagerFactory.createEntityManager());
+		}
+	}
+
+	@Repository
+	private static class TestRepository {
+
+		private final EntityManager entityManger;
+
+		public TestRepository(EntityManager entityManager) {
+			this.entityManger = entityManager;
+		}
+
+		public void doSomething() {
+			this.entityManger.persist(null);
+		}
+	}
+
+}