diff --git a/modules/gerrit/files/fakestore.cgi b/modules/gerrit/files/fakestore.cgi
new file mode 100644
index 0000000000..3900f578e8
--- /dev/null
+++ b/modules/gerrit/files/fakestore.cgi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'Content-Type: text/html
+
+OK'
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index ac8109e600..75c626132c 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -519,5 +519,13 @@ class gerrit(
       replace => true,
       require => File['/home/gerrit2/review_site/etc'],
     }
+    file { '/home/gerrit2/review_site/lib/fakestore.cgi':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0555',
+      source  => 'puppet:///modules/gerrit/fakestore.cgi',
+      require => File['/home/gerrit2/review_site/lib'],
+    }
   }
 }
diff --git a/modules/gerrit/templates/gerrit.vhost.erb b/modules/gerrit/templates/gerrit.vhost.erb
index 40ec8b6fd3..459478b257 100644
--- a/modules/gerrit/templates/gerrit.vhost.erb
+++ b/modules/gerrit/templates/gerrit.vhost.erb
@@ -62,6 +62,10 @@
   ScriptAlias /p/ /usr/lib/git-core/git-http-backend/
 <% end -%>
 
+<% if scope.lookupvar("gerrit::contactstore") == true -%>
+  ScriptAlias /fakestore /home/gerrit2/review_site/lib/fakestore.cgi
+<% end -%>
+
   <Directory /home/gerrit2/review_site/git/>
     Order allow,deny
     Allow from all