diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 1fff44ff5a..b318667cf5 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -23,24 +23,27 @@
     </bean>
 
     <!-- Datasource bean -->
-    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="driverClassName">
+    <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
+        <property name="driverClass">
             <value>${db.driver}</value>
         </property>
-        <property name="url">
+        <property name="jdbcUrl">
             <value>${db.url}</value>
         </property>
-        <property name="username">
+        <property name="user">
             <value>${db.username}</value>
         </property>
         <property name="password">
             <value>${db.password}</value>
         </property>
-        <property name="initialSize" >
-            <value>20</value>
+        <property name="initialPoolSize" >
+            <value>${db.pool.initial}</value>
         </property>
-        <property name="maxActive" >
-            <value>20</value>
+        <property name="maxPoolSize" >
+            <value>${db.pool.max}</value>
+        </property>
+        <property name="numHelperThreads" >
+            <value>1</value>
         </property>
     </bean>
 
diff --git a/config/alfresco/extension/custom-db-connection.properties.sample b/config/alfresco/extension/custom-db-connection.properties.sample
index bcc2352573..2e01750c53 100644
--- a/config/alfresco/extension/custom-db-connection.properties.sample
+++ b/config/alfresco/extension/custom-db-connection.properties.sample
@@ -4,6 +4,8 @@
 
 #db.username=alfresco
 #db.password=alfresco
+#db.pool.initial=10
+#db.pool.max=100
 
 #
 # MySQL connection (This is default and requires mysql-connector-java-3.1.12-bin.jar, which ships with the Alfresco server)
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index e185d91381..56f25c6d7e 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -54,11 +54,8 @@ db.name=alfresco
 db.url=jdbc:mysql:///${db.name}
 db.username=alfresco
 db.password=alfresco
-
-#db.name=alfresco
-#db.url=jdbc:mysql://qasi/${db.name}
-#db.username=alfresco
-#db.password=alfresco
+db.pool.initial=10
+db.pool.max=20
 
 # Email configuration