diff --git a/openstackdocstheme/theme/openstackdocs/layout.html b/openstackdocstheme/theme/openstackdocs/layout.html
index edec8907..b4c87cca 100644
--- a/openstackdocstheme/theme/openstackdocs/layout.html
+++ b/openstackdocstheme/theme/openstackdocs/layout.html
@@ -13,6 +13,7 @@
 {% if favicon %}
     <link rel="shortcut icon" href="{{ pathto('_static/favicon.ico') }}"/>
 {% endif %}
+{% if theme_analytics_tracking_code %}
 <!-- Google Analytics -->
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -20,10 +21,11 @@
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-ga('create', 'UA-17511903-1', 'auto');
+ga('create', '{{ theme_analytics_tracking_code }}', 'auto');
 ga('send', 'pageview');
 </script>
 <!-- End Google Analytics -->
+{% endif %}
   </head>
   <body>
 {% include 'header.html' %}
diff --git a/openstackdocstheme/theme/openstackdocs/theme.conf b/openstackdocstheme/theme/openstackdocs/theme.conf
index e97a043c..5d6844af 100644
--- a/openstackdocstheme/theme/openstackdocs/theme.conf
+++ b/openstackdocstheme/theme/openstackdocs/theme.conf
@@ -2,3 +2,6 @@
 inherit = basic
 stylesheet = css/basic.css
 pygments_style = native
+
+[options]
+analytics_tracking_code = UA-17511903-1
diff --git a/releasenotes/notes/disable_analytics-45d98d6fab71d2b1.yaml b/releasenotes/notes/disable_analytics-45d98d6fab71d2b1.yaml
new file mode 100644
index 00000000..393e67aa
--- /dev/null
+++ b/releasenotes/notes/disable_analytics-45d98d6fab71d2b1.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - Google Analytics tracking may now be controlled by
+    setting the ``analytics_tracking_code`` option, or
+    removed entirely by leaving that option blank.
