diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index 3c71b79dd82..0753942f496 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -17,7 +17,7 @@ Import-Template:
  javax.xml.*;version="0";resolution:=optional,
  org.h2.*;version="[1.8.0, 2.0.0)";resolution:=optional,
  org.hsqldb.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.apache.derby.*;version="[10.5.1, 10.6.0)";resolution:=optional,
+ org.apache.derby.*;version="[10.5.1000001.764942, 10.6.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
diff --git a/spring-framework-reference/src/jdbc.xml b/spring-framework-reference/src/jdbc.xml
index 5af6338fcb0..c9eaf3f4367 100644
--- a/spring-framework-reference/src/jdbc.xml
+++ b/spring-framework-reference/src/jdbc.xml
@@ -2630,8 +2630,8 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
 
     <para>The <literal>org.springframework.jdbc.datasource.embedded</literal>
     package provides support for embedded Java database engines. Support for
-    <ulink url="http://www.hsqldb.org">HSQL</ulink> and <ulink
-    url="http://www.h2database.com">H2</ulink> is provided natively. There is
+    <ulink url="http://www.hsqldb.org">HSQL</ulink>, <ulink
+    url="http://www.h2database.com">H2</ulink>, and <ulink url="http://db.apache.org/derby">Derby</ulink> is provided natively. There is
     also an extensible API for plugging in new embedded database types and
     <classname>DataSource</classname> implementations.</para>
 
@@ -2700,5 +2700,59 @@ SqlTypeValue value = new AbstractSqlTypeValue() {
       community at <ulink
       url="jira.springframework.org">jira.springframework.org</ulink>.</para>
     </section>
+    <section id="jdbc-embedded-database-using-HSQL">
+    	<title>Using HSQL</title>
+    	<para>
+    		Support for HSQL 1.0.0 to 2.0.0 is provided.
+    		HSQL is the default database embedded database that will be used if no type is specified explicitly.
+    		To specify HSQL explicitly, set the <literal>type</literal> attribute of the <literal>embedded-database</literal> tag to <literal>HSQL</literal>.
+    		If using the builder API, call the <literal>type(EmbeddedDatabaseType)</literal> method with <literal>EmbeddedDatabaseType.HSQL</literal>.
+    	</para>
+    </section>
+    <section id="jdbc-embedded-database-using-H2">
+    	<title>Using H2</title>
+    	<para>
+    		Support for H2 1.8.0 to 2.0.0 is provided.
+    		To enable H2, set the <literal>type</literal> attribute of the <literal>embedded-database</literal> tag to <literal>H2</literal>.
+    		If using the builder API, call the <literal>type(EmbeddedDatabaseType)</literal> method with <literal>EmbeddedDatabaseType.H2</literal>.
+    	</para>
+    </section>
+    <section id="jdbc-embedded-database-using-Derby">
+    	<title>Using Derby</title>
+    	<para>
+    		Support for Apache Derby 10.5.1.1 to 10.6.0 is provided.
+    		To enable Derby, set the <literal>type</literal> attribute of the <literal>embedded-database</literal> tag to <literal>Derby</literal>.
+    		If using the builder API, call the <literal>type(EmbeddedDatabaseType)</literal> method with <literal>EmbeddedDatabaseType.Derby</literal>.
+    	</para>
+    </section>
+    <section id="jdbc-embedded-database-dao-testing">
+    	<title>Unit testing data access logic with an EmbeddedDatabase</title>
+    	<para>
+    		Embedded databases provide a lightweight way to test data access code.
+    		A basic data access unit test template that uses an embedded database is provided below:
+    	</para>
+      <programlisting language="java"><![CDATA[
+public class DataAccessUnitTestTemplate {
+    private EmbeddedDatabase db;
+    
+    @Before
+    public void setUp() {
+        // creates a HSQL in-memory db populated from classpath:schema.sql and classpath:test-data.sql
+        db = EmbeddedDatabaseBuilder.buildDefault();		
+    }
+	
+    @Test
+    public void testDataAccess() {
+        JdbcTemplate template = new JdbcTemplate(db);
+        template.query(...);
+    }
+	
+    @After
+    public void tearDown() {
+        db.shutdown();
+    }
+}
+]]></programlisting>    	
+    </section>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/spring-framework-reference/src/new-in-3.xml b/spring-framework-reference/src/new-in-3.xml
index 566eb449287..690e934360a 100644
--- a/spring-framework-reference/src/new-in-3.xml
+++ b/spring-framework-reference/src/new-in-3.xml
@@ -453,7 +453,7 @@ public class AppConfig{
     <section id="new-feature-embedded-databases">
     	<title>Support for embedded databases</title>
     	<para>
-    		Convenient support for <link linkend="jdbc-embedded-database-support">embedded Java database engines</link>, such as HSQL and H2, is now provided.
+    		Convenient support for <link linkend="jdbc-embedded-database-support">embedded Java database engines</link>, including HSQL, H2, and Derby, is now provided.
     	</para>
     </section>