diff --git a/defaults/main.yml b/defaults/main.yml
index 779e8f4..39beaf7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,6 +3,8 @@ postgresql:
     enable: True
     keep_days: 3
   listen_addresses: localhost
+  max_connections: 100
+  shared_buffers: 128MB
   allowed_hosts: {}
   dbs: {}
   users: {}
diff --git a/templates/postgresql.conf.j2 b/templates/postgresql.conf.j2
index 5941946..8bbe31d 100644
--- a/templates/postgresql.conf.j2
+++ b/templates/postgresql.conf.j2
@@ -62,7 +62,7 @@ listen_addresses = '{{ postgresql.listen_addresses }}'		# what IP address(es) to
 					# defaults to 'localhost'; use '*' for all
 					# (change requires restart)
 port = 5432				# (change requires restart)
-max_connections = 100			# (change requires restart)
+max_connections = {{ postgresql.max_connections }}			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
 unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
 					# (change requires restart)
@@ -119,7 +119,7 @@ ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
 
 # - Memory -
 
-shared_buffers = 128MB			# min 128kB
+shared_buffers = {{ postgresql.shared_buffers }}			# min 128kB
 					# (change requires restart)
 #huge_pages = try			# on, off, or try
 					# (change requires restart)