diff --git a/docs/settings.rst b/docs/settings.rst
index 61fd8521..757f247e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -699,15 +699,18 @@ Following are example ways to specify your preferred theme::
 The built-in ``notmyidea`` theme can make good use of the following settings. Feel
 free to use them in your themes as well.
 
-=======================   =======================================================
+=======================   =====================================================
 Setting name              What does it do?
-=======================   =======================================================
+=======================   =====================================================
 ``SITESUBTITLE``          A subtitle to appear in the header.
 ``DISQUS_SITENAME``       Pelican can handle Disqus comments. Specify the
                           Disqus sitename identifier here.
 ``GITHUB_URL``            Your GitHub URL (if you have one). It will then
                           use this information to create a GitHub ribbon.
-``GOOGLE_ANALYTICS``      Set to 'UA-XXXX-YYYY' to activate Google Analytics.
+``GOOGLE_ANALYTICS``      Set to ``UA-XXXXX-Y`` Property's tracking ID to
+                          activate Google Analytics.
+``GA_COOKIE_DOMAIN``      Set cookie domain field of Google Analytics tracking
+                          code. Defaults to ``auto``.
 ``GOSQUARED_SITENAME``    Set to 'XXX-YYYYYY-X' to activate GoSquared.
 ``MENUITEMS``             A list of tuples (Title, URL) for additional menu
                           items to appear at the beginning of the main menu.
@@ -728,7 +731,7 @@ Setting name              What does it do?
                           If not specified, defaults to "links".
 ``SOCIAL_WIDGET_NAME``    Allows override of the name of the "social" widget.
                           If not specified, defaults to "social".
-=======================   =======================================================
+=======================   =====================================================
 
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index 465754e2..a966c4c2 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -1,13 +1,12 @@
 {% if GOOGLE_ANALYTICS %}
     <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
-    _gaq.push(['_trackPageview']);
-    (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = 'https://ssl.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{GOOGLE_ANALYTICS}}', '{{GA_COOKIE_DOMAIN if GA_COOKIE_DOMAIN else 'auto'}}');
+    ga('send', 'pageview');
     </script>
 {% endif %}
 {% if GAUGES %}