diff --git a/manifests/init.pp b/manifests/init.pp
index 8fbe576..ca538f2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -70,6 +70,8 @@ class puppetdb (
   $temp_usage                        = $puppetdb::params::temp_usage,
   $certificate_whitelist_file        = $puppetdb::params::certificate_whitelist_file,
   $certificate_whitelist             = $puppetdb::params::certificate_whitelist,
+  $database_max_pool_size            = $puppetdb::params::database_max_pool_size,
+  $read_database_max_pool_size       = $puppetdb::params::read_database_max_pool_size,
 ) inherits puppetdb::params {
 
   class { '::puppetdb::server':
@@ -138,6 +140,8 @@ class puppetdb (
     temp_usage                        => $temp_usage,
     certificate_whitelist_file        => $certificate_whitelist_file,
     certificate_whitelist             => $certificate_whitelist,
+    database_max_pool_size            => $database_max_pool_size,
+    read_database_max_pool_size       => $read_database_max_pool_size,
   }
 
   if ($database == 'postgres') {
diff --git a/manifests/params.pp b/manifests/params.pp
index 4c9bc20..7f33bd6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,14 +20,15 @@ class puppetdb::params inherits puppetdb::globals {
   $postgres_version          = '9.4'
 
   # The remaining database settings are not used for an embedded database
-  $database_host       = 'localhost'
-  $database_port       = '5432'
-  $database_name       = 'puppetdb'
-  $database_username   = 'puppetdb'
-  $database_password   = 'puppetdb'
-  $database_ssl        = undef
-  $jdbc_ssl_properties = ''
-  $database_validate   = true
+  $database_host          = 'localhost'
+  $database_port          = '5432'
+  $database_name          = 'puppetdb'
+  $database_username      = 'puppetdb'
+  $database_password      = 'puppetdb'
+  $database_ssl           = undef
+  $jdbc_ssl_properties    = ''
+  $database_validate      = true
+  $database_max_pool_size = undef
 
   # These settings manage the various auto-deactivation and auto-purge settings
   $node_ttl               = '0s'
@@ -57,6 +58,7 @@ class puppetdb::params inherits puppetdb::globals {
   $read_conn_max_age                 = '60'
   $read_conn_keep_alive              = '45'
   $read_conn_lifetime                = '0'
+  $read_database_max_pool_size       = undef
 
   $manage_firewall         = true
   $java_args               = {}
@@ -173,4 +175,13 @@ class puppetdb::params inherits puppetdb::globals {
   $certificate_whitelist      = [ ]
   # change to this to only allow access by the puppet master by default:
   #$certificate_whitelist      = [ $::servername ]
+
+  # Get the parameter name for the database connection pool tuning
+  if $puppetdb_version in ['latest','present'] or versioncmp($puppetdb_version, '4.0.0') >= 0 {
+    $database_max_pool_size_setting_name = 'maximum-pool-size'
+  } elsif versioncmp($puppetdb_version, '2.8.0') >= 0 {
+    $database_max_pool_size_setting_name = 'partition-conn-max'
+  } else {
+    $database_max_pool_size_setting_name = undef
+  }
 }
diff --git a/manifests/server.pp b/manifests/server.pp
index 68133c5..e0aeb36 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -65,6 +65,8 @@ class puppetdb::server (
   $temp_usage                        = $puppetdb::params::temp_usage,
   $certificate_whitelist_file        = $puppetdb::params::certificate_whitelist_file,
   $certificate_whitelist             = $puppetdb::params::certificate_whitelist,
+  $database_max_pool_size            = $puppetdb::params::database_max_pool_size,
+  $read_database_max_pool_size       = $puppetdb::params::read_database_max_pool_size,
 ) inherits puppetdb::params {
   # deprecation warnings
   if $database_ssl != undef {
@@ -160,6 +162,7 @@ class puppetdb::server (
     database_password      => $database_password,
     database_name          => $database_name,
     database_ssl           => $database_ssl,
+    database_max_pool_size => $database_max_pool_size,
     jdbc_ssl_properties    => $jdbc_ssl_properties,
     database_validate      => $database_validate,
     database_embedded_path => $database_embedded_path,
@@ -178,23 +181,24 @@ class puppetdb::server (
   }
 
   class { 'puppetdb::server::read_database':
-    database            => $read_database,
-    database_host       => $read_database_host,
-    database_port       => $read_database_port,
-    database_username   => $read_database_username,
-    database_password   => $read_database_password,
-    database_name       => $read_database_name,
-    database_ssl        => $read_database_ssl,
-    jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
-    database_validate   => $read_database_validate,
-    log_slow_statements => $read_log_slow_statements,
-    conn_max_age        => $read_conn_max_age,
-    conn_keep_alive     => $read_conn_keep_alive,
-    conn_lifetime       => $read_conn_lifetime,
-    confdir             => $confdir,
-    puppetdb_user       => $puppetdb_user,
-    puppetdb_group      => $puppetdb_group,
-    notify              => Service[$puppetdb_service],
+    database               => $read_database,
+    database_host          => $read_database_host,
+    database_port          => $read_database_port,
+    database_username      => $read_database_username,
+    database_password      => $read_database_password,
+    database_name          => $read_database_name,
+    database_ssl           => $read_database_ssl,
+    jdbc_ssl_properties    => $read_database_jdbc_ssl_properties,
+    database_validate      => $read_database_validate,
+    log_slow_statements    => $read_log_slow_statements,
+    conn_max_age           => $read_conn_max_age,
+    conn_keep_alive        => $read_conn_keep_alive,
+    conn_lifetime          => $read_conn_lifetime,
+    confdir                => $confdir,
+    puppetdb_user          => $puppetdb_user,
+    puppetdb_group         => $puppetdb_group,
+    notify                 => Service[$puppetdb_service],
+    database_max_pool_size => $read_database_max_pool_size,
   }
 
   if str2bool($ssl_set_cert_paths) == true
diff --git a/manifests/server/database.pp b/manifests/server/database.pp
index eb06485..c3a19ae 100644
--- a/manifests/server/database.pp
+++ b/manifests/server/database.pp
@@ -21,6 +21,7 @@ class puppetdb::server::database (
   $confdir                = $puppetdb::params::confdir,
   $puppetdb_user          = $puppetdb::params::puppetdb_user,
   $puppetdb_group         = $puppetdb::params::puppetdb_group,
+  $database_max_pool_size = $puppetdb::params::database_max_pool_size,
 ) inherits puppetdb::params {
 
   if str2bool($database_validate) {
@@ -159,4 +160,18 @@ class puppetdb::server::database (
     setting => 'conn-lifetime',
     value   => $conn_lifetime,
   }
+
+  if $puppetdb::params::database_max_pool_size_setting_name != undef {
+    if $database_max_pool_size == 'absent' {
+      ini_setting { 'puppetdb_database_max_pool_size':
+        ensure  => absent,
+        setting => $puppetdb::params::database_max_pool_size_setting_name,
+      }
+    } elsif $database_max_pool_size != undef {
+      ini_setting { 'puppetdb_database_max_pool_size':
+        setting => $puppetdb::params::database_max_pool_size_setting_name,
+        value   => $database_max_pool_size,
+      }
+    }
+  }
 }
diff --git a/manifests/server/read_database.pp b/manifests/server/read_database.pp
index 73f2b56..daa1904 100644
--- a/manifests/server/read_database.pp
+++ b/manifests/server/read_database.pp
@@ -1,21 +1,22 @@
 # PRIVATE CLASS - do not use directly
 class puppetdb::server::read_database (
-  $database            = $puppetdb::params::read_database,
-  $database_host       = $puppetdb::params::read_database_host,
-  $database_port       = $puppetdb::params::read_database_port,
-  $database_username   = $puppetdb::params::read_database_username,
-  $database_password   = $puppetdb::params::read_database_password,
-  $database_name       = $puppetdb::params::read_database_name,
-  $database_ssl        = $puppetdb::params::read_database_ssl,
-  $jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
-  $database_validate   = $puppetdb::params::read_database_validate,
-  $log_slow_statements = $puppetdb::params::read_log_slow_statements,
-  $conn_max_age        = $puppetdb::params::read_conn_max_age,
-  $conn_keep_alive     = $puppetdb::params::read_conn_keep_alive,
-  $conn_lifetime       = $puppetdb::params::read_conn_lifetime,
-  $confdir             = $puppetdb::params::confdir,
-  $puppetdb_user       = $puppetdb::params::puppetdb_user,
-  $puppetdb_group      = $puppetdb::params::puppetdb_group,
+  $database               = $puppetdb::params::read_database,
+  $database_host          = $puppetdb::params::read_database_host,
+  $database_port          = $puppetdb::params::read_database_port,
+  $database_username      = $puppetdb::params::read_database_username,
+  $database_password      = $puppetdb::params::read_database_password,
+  $database_name          = $puppetdb::params::read_database_name,
+  $database_ssl           = $puppetdb::params::read_database_ssl,
+  $jdbc_ssl_properties    = $puppetdb::params::read_database_jdbc_ssl_properties,
+  $database_validate      = $puppetdb::params::read_database_validate,
+  $log_slow_statements    = $puppetdb::params::read_log_slow_statements,
+  $conn_max_age           = $puppetdb::params::read_conn_max_age,
+  $conn_keep_alive        = $puppetdb::params::read_conn_keep_alive,
+  $conn_lifetime          = $puppetdb::params::read_conn_lifetime,
+  $confdir                = $puppetdb::params::confdir,
+  $puppetdb_user          = $puppetdb::params::puppetdb_user,
+  $puppetdb_group         = $puppetdb::params::puppetdb_group,
+  $database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
 ) inherits puppetdb::params {
 
   # Only add the read database configuration if database host is defined.
@@ -129,6 +130,20 @@ class puppetdb::server::read_database (
       setting => 'conn-lifetime',
       value   => $conn_lifetime,
     }
+
+    if $puppetdb::params::database_max_pool_size_setting_name != undef {
+      if $database_max_pool_size == 'absent' {
+        ini_setting { 'puppetdb_read_database_max_pool_size':
+          ensure  => absent,
+          setting => $puppetdb::params::database_max_pool_size_setting_name,
+        }
+      } elsif $database_max_pool_size != undef {
+        ini_setting { 'puppetdb_read_database_max_pool_size':
+          setting => $puppetdb::params::database_max_pool_size_setting_name,
+          value   => $database_max_pool_size,
+        }
+      }
+    }
   } else {
     file { "${confdir}/read_database.ini":
       ensure => absent,
diff --git a/spec/unit/classes/server/database_ini_spec.rb b/spec/unit/classes/server/database_ini_spec.rb
index 4083744..07b48fd 100644
--- a/spec/unit/classes/server/database_ini_spec.rb
+++ b/spec/unit/classes/server/database_ini_spec.rb
@@ -125,6 +125,7 @@ describe 'puppetdb::server::database', :type => :class do
              'setting' => 'conn-lifetime',
              'value'   => '0'
              )}
+      it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
     end
 
     describe 'when using a legacy PuppetDB version' do
@@ -233,6 +234,7 @@ describe 'puppetdb::server::database', :type => :class do
              'setting' => 'conn-lifetime',
              'value'   => '0'
              )}
+      it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
     end
 
     describe 'when overriding database_path for embedded' do
@@ -251,5 +253,95 @@ describe 'puppetdb::server::database', :type => :class do
              'value'   => 'file:/tmp/foo;hsqldb.tx=mvcc;sql.syntax_pgs=true'
              )}
     end
+
+    describe 'when setting max pool size' do
+      context 'on current PuppetDB' do
+        describe 'to a numeric value' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 12345
+            }
+          end
+          it { should contain_ini_setting('puppetdb_database_max_pool_size').
+            with(
+              'ensure'  => 'present',
+              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
+              'section' => 'database',
+              'setting' => 'maximum-pool-size',
+              'value'   => '12345'
+            )}
+        end
+
+        describe 'to absent' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 'absent'
+            }
+          end
+          it { should contain_ini_setting('puppetdb_database_max_pool_size').
+            with(
+              'ensure'  => 'absent',
+              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
+              'section' => 'database',
+              'setting' => 'maximum-pool-size'
+            )}
+        end
+      end
+
+      context 'on PuppetDB 3.2' do
+        let (:pre_condition) { 'class { "puppetdb::globals": version => "3.2.0", }' }
+        describe 'to a numeric value' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 12345
+            }
+          end
+          it { should contain_ini_setting('puppetdb_database_max_pool_size').
+            with(
+              'ensure'  => 'present',
+              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
+              'section' => 'database',
+              'setting' => 'partition-conn-max',
+              'value'   => '12345'
+            )}
+        end
+
+        describe 'to absent' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 'absent'
+            }
+          end
+          it { should contain_ini_setting('puppetdb_database_max_pool_size').
+            with(
+              'ensure'  => 'absent',
+              'path'    => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
+              'section' => 'database',
+              'setting' => 'partition-conn-max'
+            )}
+        end
+      end
+
+      context 'on a legacy PuppetDB version' do
+        let (:pre_condition) { 'class { "puppetdb::globals": version => "2.2.0", }' }
+        describe 'to a numeric value' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 12345
+            }
+          end
+          it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
+        end
+
+        describe 'to absent' do
+          let(:params) do
+            {
+              'database_max_pool_size' => 'absent'
+            }
+          end
+          it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
+        end
+      end
+    end
   end
 end