diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
index 7818c7f1307..1a337931352 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -35,6 +35,9 @@ import javax.persistence.ValidationMode;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.weaving.LoadTimeWeaverAware;
@@ -119,6 +122,8 @@ public class DefaultPersistenceUnitManager
 	}
 
 
+	protected final Log logger = LogFactory.getLog(getClass());
+
 	private String[] persistenceXmlLocations = new String[] {DEFAULT_PERSISTENCE_XML_LOCATION};
 
 	private String defaultPersistenceUnitRootLocation = ORIGINAL_DEFAULT_PERSISTENCE_UNIT_ROOT_LOCATION;
@@ -397,6 +402,7 @@ public class DefaultPersistenceUnitManager
 	public void preparePersistenceUnitInfos() {
 		this.persistenceUnitInfoNames.clear();
 		this.persistenceUnitInfos.clear();
+
 		List<SpringPersistenceUnitInfo> puis = readPersistenceUnitInfos();
 		for (SpringPersistenceUnitInfo pui : puis) {
 			if (pui.getPersistenceUnitRootUrl() == null) {
@@ -439,18 +445,29 @@ public class DefaultPersistenceUnitManager
 	 */
 	private List<SpringPersistenceUnitInfo> readPersistenceUnitInfos() {
 		List<SpringPersistenceUnitInfo> infos = new LinkedList<SpringPersistenceUnitInfo>();
+		String defaultName = this.defaultPersistenceUnitName;
 		boolean buildDefaultUnit = (this.packagesToScan != null || this.mappingResources != null);
+		boolean foundDefaultUnit = false;
+
 		PersistenceUnitReader reader = new PersistenceUnitReader(this.resourcePatternResolver, this.dataSourceLookup);
 		SpringPersistenceUnitInfo[] readInfos = reader.readPersistenceUnitInfos(this.persistenceXmlLocations);
 		for (SpringPersistenceUnitInfo readInfo : readInfos) {
 			infos.add(readInfo);
-			if (this.defaultPersistenceUnitName != null &&
-					this.defaultPersistenceUnitName.equals(readInfo.getPersistenceUnitName())) {
-				buildDefaultUnit = false;
+			if (defaultName != null && defaultName.equals(readInfo.getPersistenceUnitName())) {
+				foundDefaultUnit = true;
 			}
 		}
+
 		if (buildDefaultUnit) {
-			infos.add(buildDefaultPersistenceUnitInfo());
+			if (foundDefaultUnit) {
+				if (logger.isInfoEnabled()) {
+					logger.info("Found explicit default unit with name '" + defaultName + "' in persistence.xml - " +
+							"overriding local default unit settings ('packagesToScan'/'mappingResources')");
+				}
+			}
+			else {
+				infos.add(buildDefaultPersistenceUnitInfo());
+			}
 		}
 		return infos;
 	}