diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index b3e953d490..b7b889b52e 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -17,9 +17,11 @@ Google Gson                 <<apache2,Apache License 2.0>>
 Google Web Toolkit          <<apache2,Apache License 2.0>>
 Guice                       <<apache2,Apache License 2.0>>
 Apache Commons Codec        <<apache2,Apache License 2.0>>
+Apache Commons DBCP         <<apache2,Apache License 2.0>>
 Apache Commons Logging      <<apache2,Apache License 2.0>>
 Apache Commons Http Client  <<apache2,Apache License 2.0>>
 Apache Commons Net          <<apache2,Apache License 2.0>>
+Apache Commons Pool         <<apache2,Apache License 2.0>>
 Apache Log4J                <<apache2,Apache License 2.0>>
 Apache MINA                 <<apache2,Apache License 2.0>>
 Apache SSHD                 <<apache2,Apache License 2.0>>, see also <<sshd,NOTICE>>
@@ -34,6 +36,8 @@ mime-util                   <<apache2,Apache License 2.0>>
 ICU4J                       <<icu4j,ICU4J License>>
 JGit                        <<jgit,New-Style BSD>>
 JSch                        <<sshd,New-Style BSD>>
+PostgreSQL JDBC Driver      <<postgresql,New-Style BSD>>
+H2 Database                 <<h2,EPL or modified MPL>>
 ObjectWeb ASM               <<asm,New-Style BSD>>
 ANTLR                       <<antlr,New-Style BSD>>
 args4j                      <<args4j,MIT License>>
@@ -350,6 +354,51 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ----
 
+[[postgresql]]
+PostgreSQL JDBC Driver - New Style BSD
+--------------------------------------
+
+* link:http://jdbc.postgresql.org/license.html[Original]
+
+----
+Copyright (c) 1997-2008, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+   of its contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+----
+
+[[h2]]
+H2 Database - EPL or modified MPL
+---------------------------------
+
+* link:http://www.h2database.com/html/license.html[Complete Terms]
+
+H2 is dual licensed and available under a modified version of the
+MPL 1.1 (Mozilla Public License) or under the (unmodified) EPL 1.0
+(link:http://opensource.org/licenses/eclipse-1.0.php[Eclipse Public License]).
+
 [[asm]]
 ObjectWeb ASM - New Style BSD
 -----------------------------
diff --git a/gerrit-pgm/pom.xml b/gerrit-pgm/pom.xml
index 485de55135..3acf8b1d3d 100644
--- a/gerrit-pgm/pom.xml
+++ b/gerrit-pgm/pom.xml
@@ -33,6 +33,21 @@ limitations under the License.
   </description>
 
   <dependencies>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.google.gerrit</groupId>
       <artifactId>gerrit-util-cli</artifactId>
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example b/gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example
index b158fef33f..a3e0d734f9 100644
--- a/gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example
+++ b/gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example
@@ -9,17 +9,15 @@
 
 
 # H2
-# curl -O http://repo1.maven.org/maven2/com/h2database/h2/1.1.112/h2-1.1.112.jar
+# (driver included)
 #
-# database.classpath = h2-1.1.112.jar
 # database.driver = org.h2.Driver
 # database.url = jdbc:h2:file:ReviewDb
 
 
 # PostgreSQL
-# curl -O http://jdbc.postgresql.org/download/postgresql-8.3-604.jdbc3.jar
+# (driver included)
 #
-# database.classpath = postgresql-8.3-604.jdbc3.jar
 # database.driver = org.postgresql.Driver
 # database.url = jdbc:postgresql:reviewdb
 # database.user = gerrit2
diff --git a/pom.xml b/pom.xml
index 57f1f90b58..f69e0e5eb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -585,6 +585,18 @@ limitations under the License.
         <version>1.3</version>
       </dependency>
 
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>1.2.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>1.5.3</version>
+      </dependency>
+
       <dependency>
         <groupId>eu.medsea.mimeutil</groupId>
         <artifactId>mime-util</artifactId>
@@ -683,6 +695,12 @@ limitations under the License.
         <version>1.2.122</version>
       </dependency>
 
+      <dependency>
+          <groupId>postgresql</groupId>
+          <artifactId>postgresql</artifactId>
+          <version>8.4-701.jdbc4</version>
+      </dependency>
+
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>