diff --git a/config/alfresco/extension/custom-hibernate-dialect.properties.sample b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
index a7023363b1..ff824cdf6e 100644
--- a/config/alfresco/extension/custom-hibernate-dialect.properties.sample
+++ b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
@@ -18,21 +18,6 @@
 #
 #hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 
-#
-# Oracle dialect
-#
-#hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
-
-#
-# Sybase dialect
-#
-#hibernate.dialect=org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect
-
-#
-# SQLServer dialect
-#
-#hibernate.dialect=org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect
-
 #
 # PostgreSQL dialect
 #
diff --git a/config/alfresco/extension/custom-repository.properties.sample b/config/alfresco/extension/custom-repository.properties.sample
index 72d113059a..7b636ecdf4 100644
--- a/config/alfresco/extension/custom-repository.properties.sample
+++ b/config/alfresco/extension/custom-repository.properties.sample
@@ -46,30 +46,6 @@
 #db.driver=org.gjt.mm.mysql.Driver
 #db.url=jdbc:mysql://localhost/alfresco
 
-#
-# Oracle connection (requires ojdbc14_g.jar or equivalent jar in shared libraries location)
-#
-#db.driver=oracle.jdbc.OracleDriver
-#db.url=jdbc:oracle:thin:@localhost:1521:alfresco
-
-#
-# Sybase connection (requires jconn2d.jar or equivalent jar in shared libraries location)
-#
-#db.driver=com.sybase.jdbc2.jdbc.SybDriver
-#db.url=jdbc:sybase:Tds:localhost:2638/alfresco
-
-#
-# SQLServer connection (requires jdts-1.2.jar or equivalent - http://jtds.sourceforge.net/)
-#
-#db.driver=net.sourceforge.jtds.jdbc.Driver
-#db.url=jdbc:jtds:sqlserver://localhost/alfresco
-
-#
-# SQLServer connection using Microsoft JDDB driver
-#
-#db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#db.url=jdbc:sqlserver://localhost;DatabaseName=alfresco
-
 #
 # PostgreSQL connection (requires postgresql-8.2-504.jdbc3.jar or equivalent)
 #
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index c4d5fdf223..6f51190349 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -33,6 +33,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Writer;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -1088,8 +1089,22 @@ public class SchemaBootstrap extends AbstractLifecycleBean
     @Override
     protected void onShutdown(ApplicationEvent event)
     {
-        // NOOP
-    }
+		Configuration cfg = localSessionFactory.getConfiguration();
+		// Shut down DB, if required
+		Dialect dialect = Dialect.getDialect(cfg.getProperties());
+		Class dialectClazz = dialect.getClass();
+		if (dialectClazz.equals(DerbyDialect.class))
+		{
+			try
+			{
+				DriverManager.getConnection("jdbc:derby:;shutdown=true");
+			}
+			// Derby shutdown always triggers an exception, even when clean
+			catch (Throwable e) 
+			{
+			}
+		}
+	}
     
     /**
      * This is a workaround for the odd Spring-Hibernate interaction during configuration.