diff --git a/puppet-{{cookiecutter.project_name}}/manifests/db.pp b/puppet-{{cookiecutter.project_name}}/manifests/db.pp
index 92552a2..9a09a0e 100644
--- a/puppet-{{cookiecutter.project_name}}/manifests/db.pp
+++ b/puppet-{{cookiecutter.project_name}}/manifests/db.pp
@@ -38,6 +38,10 @@
 #   (Optional) If set, use this value for max_overflow with sqlalchemy.
 #   Defaults to $::os_service_default
 #
+# [*database_pool_timeout*]
+#   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
+#   Defaults to $::os_service_default
+#
 class {{cookiecutter.project_name}}::db (
   $database_connection     = 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite',
   $database_idle_timeout   = $::os_service_default,
@@ -47,6 +51,7 @@ class {{cookiecutter.project_name}}::db (
   $database_max_retries    = $::os_service_default,
   $database_retry_interval = $::os_service_default,
   $database_max_overflow   = $::os_service_default,
+  $database_pool_timeout   = $::os_service_default,
 ) {
 
   include ::{{cookiecutter.project_name}}::deps
@@ -63,5 +68,6 @@ class {{cookiecutter.project_name}}::db (
     retry_interval => $database_retry_interval,
     max_pool_size  => $database_max_pool_size,
     max_overflow   => $database_max_overflow,
+    pool_timeout   => $database_pool_timeout,
   }
 }
diff --git a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb
index 423af68..fa87eed 100644
--- a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb
+++ b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb
@@ -13,6 +13,7 @@ describe '{{cookiecutter.project_name}}::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@ describe '{{cookiecutter.project_name}}::db' do
           :database_retry_interval => '11',
           :database_max_pool_size  => '11',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
         }
       end
 
@@ -38,6 +40,7 @@ describe '{{cookiecutter.project_name}}::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end