diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 6cd3c27..50042c5 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -106,12 +106,24 @@ class puppet::manual inherits puppet::client {
 #       Array containing ports that puppetmaster should listen to. Defaults to
 #       [ "18140", "18141", "18142", "18143", ].
 #
+#   $puppet_storeconfigs:
+#       Store config type to use. Valid values are "thin", "full" and "none".
+#       Defaults to "thin".
+#
 class puppet::server inherits puppet::client {
 
     if ! $puppet_listenports {
         $puppet_listenports = [ "18140", "18141", "18142", "18143", ]
     }
-  
+
+    case $puppet_storeconfigs {
+        "": { $puppet_storeconfigs = "thin" }
+        "thin","full","none": { }
+        default: {
+            fail("Invalid value ${puppet_storeconfigs} for variable \$puppet_storeconfigs.")
+        }
+    }
+
     package { "puppet-server":
         ensure => installed,
     }
diff --git a/puppet/templates/puppetmaster.conf.erb b/puppet/templates/puppetmaster.conf.erb
index 3370125..47f43b1 100644
--- a/puppet/templates/puppetmaster.conf.erb
+++ b/puppet/templates/puppetmaster.conf.erb
@@ -12,7 +12,10 @@
     # Server bucket store.
     bucketdir = /srv/puppet/bucket
 
+<% if puppet_storeconfigs != 'none' -%>
     # Use storeconfigs
     storeconfigs = true
+<% if puppet_storeconfigs == 'thin' %>    thin_storedconfigs = true<% end %>
     dbadapter = sqlite3
     dblocation = /srv/puppet/storeconfigs/storeconfigs.db
+<% end -%>