diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 0fe4a7d7d8..3ac21874e7 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -24,6 +24,7 @@ class zuul (
   $internal_gearman = true,
   $gerrit_server = '',
   $gerrit_user = '',
+  $gerrit_baseurl = '',
   $zuul_ssh_private_key = '',
   $url_pattern = '',
   $status_url = "https://${::fqdn}/",
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index 75534cad61..18cb54f25c 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -9,6 +9,9 @@ log_config=/etc/zuul/gearman-logging.conf
 server=<%= gerrit_server %>
 user=<%= gerrit_user %>
 sshkey=/var/lib/zuul/ssh/id_rsa
+<% if gerrit_baseurl != "" -%>
+baseurl=<%= gerrit_baseurl %>
+<% end -%>
 
 [zuul]
 layout_config=/etc/zuul/layout.yaml