diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 564ddb861..664d78c20 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -58,6 +58,12 @@ things you may need or wish to modify:
 ``GOOGLE_ANALYTICS_ID``
     Your ID from `Google Analytics <http://www.google.com/analytics/>`_
 
+``GOOGLE_ANALYTICS_SUBDOMAINS``
+    If you use subdomains with `Google Analytics <http://www.google.com/analytics/>`_ , set your subdomains.
+
+``GOOGLE_ANALYTICS_MULTIPLE_TOPLEVEL_DOMAINS``
+    If you use multiple top-level domains with `Google Analytics <http://www.google.com/analytics/>`_ , set ``True``.
+    
 ``SITE_THEME``
     The name of the directory under ``themes`` to look for the theme templates
     and static files.  We'll have more detail on creating a theme soon.
diff --git a/sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template b/sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template
index c8cb883d3..e28b92630 100644
--- a/sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template
+++ b/sapling/etc/install_config/defaults/localwiki/conf/localsettings.py.template
@@ -20,6 +20,10 @@ CLOUDMADE_API_KEY = 'CLOUDMADEAPIKEYHERE'
 
 # Get a Google Analytics ID at https://www.google.com/analytics.
 GOOGLE_ANALYTICS_ID = ''
+# If use 'Subdomains' with Google Analytics, set here
+GOOGLE_ANALYTICS_SUBDOMAINS = ''
+# If use 'Multiple top-level domains' with Google Analytics, comment out here
+# GOOGLE_ANALYTICS_MULTIPLE_TOPLEVEL_DOMAINS = True
 
 # For testing, you can start the python debugging smtp server like so:
 # sudo python -m smtpd -n -c DebuggingServer localhost:25
diff --git a/sapling/themes/sapling/templates/site/base.html b/sapling/themes/sapling/templates/site/base.html
index b0e4aa553..6189ec824 100644
--- a/sapling/themes/sapling/templates/site/base.html
+++ b/sapling/themes/sapling/templates/site/base.html
@@ -30,6 +30,12 @@
   <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS_ID }}']);
+    {% if GOOGLE_ANALYTICS_SUBDOMAINS %}
+      _gaq.push(['_setDomainName', '{{ GOOGLE_ANALYTICS_SUBDOMAINS }}']);
+      {% if GOOGLE_ANALYTICS_MULTIPLE_TOPLEVEL_DOMAINS %}
+        _gaq.push(['_setAllowLinker', true]);
+      {% endif %}
+    {% endif %}
     _gaq.push(['_trackPageview']);
     (function() {
       var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
diff --git a/sapling/utils/context_processors/settings.py b/sapling/utils/context_processors/settings.py
index 77b1373d5..5df337d7c 100644
--- a/sapling/utils/context_processors/settings.py
+++ b/sapling/utils/context_processors/settings.py
@@ -11,5 +11,7 @@ def license_agreements(context):
 
 def services(context):
     return {
-        'GOOGLE_ANALYTICS_ID': getattr(settings, 'GOOGLE_ANALYTICS_ID', '')
+        'GOOGLE_ANALYTICS_ID': getattr(settings, 'GOOGLE_ANALYTICS_ID', ''),
+        'GOOGLE_ANALYTICS_SUBDOMAINS': getattr(settings, 'GOOGLE_ANALYTICS_SUBDOMAINS', ''),
+        'GOOGLE_ANALYTICS_MULTIPLE_TOPLEVEL_DOMAINS': getattr(settings, 'GOOGLE_ANALYTICS_MULTIPLE_TOPLEVEL_DOMAINS', False)
     }