diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index d93b42c39d..d574e530e9 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -46,6 +46,8 @@
 #     A boolean enabling replication to github
 #   replicate_local:
 #     A boolean enabling local replication for apache acceleration
+#   gitweb:
+#     A boolean enabling gitweb
 #   testmode:
 #     Set this to true to disable cron jobs and replication,
 #     which can interfere with testing.
@@ -80,6 +82,7 @@ class gerrit($virtual_hostname=$fqdn,
       $replicate_local=true,
       $local_git_dir='/var/lib/git',
       $replication_targets=[],
+      $gitweb=true,
       $testmode=false
       ) {
 
@@ -106,8 +109,13 @@ class gerrit($virtual_hostname=$fqdn,
     ensure => present
   }
 
-  $packages = ["gitweb",
-	       "openjdk-6-jre-headless"]
+  if ($gitweb) {
+      package { "gitweb":
+          ensure => present
+      }
+  }
+
+  $packages = ["openjdk-6-jre-headless"]
 
   package { $packages:
     ensure => present,
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index 1ba396c171..be8d16c1e0 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,5 +78,7 @@
 [melody]
 	monitoring = <%= enable_melody %>
 	session = <%= melody_session %>
+<% if gitweb -%>
 [gitweb]
 	revision = "?p=${project}.git;a=commitdiff;h=${commit}"
+<% end -%>