diff --git a/www/templates/google_analytics.tmpl b/www/templates/google_analytics.tmpl
index e4f91ee560..2269e50e52 100644
--- a/www/templates/google_analytics.tmpl
+++ b/www/templates/google_analytics.tmpl
@@ -1,11 +1,8 @@
-<!-- Google Analytics -->
-<script>
-(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','//www.google-analytics.com/analytics.js','ga');
-
-ga('create', 'UA-17511903-1', 'auto');
-ga('send', 'pageview');
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-DD299CMF7V">
+</script>
+<script>
+window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);} gtag('js', new Date());
+gtag('config', 'G-DD299CMF7V');
 </script>
-<!-- End Google Analytics -->
diff --git a/www/templates/script_search.tmpl b/www/templates/script_search.tmpl
index 4620696334..414fb0b274 100644
--- a/www/templates/script_search.tmpl
+++ b/www/templates/script_search.tmpl
@@ -6,7 +6,7 @@
                     language: 'en'
                 });
                 var _gaq = _gaq ||[];
-                _gaq.push([ "_setAccount", "UA-17511903-1"]);
+                _gaq.push([ "_setAccount", "G-DD299CMF7V"]);
                 function _trackQuery(control, searcher, query) {
                     var gaQueryParamName = "q";
                     var loc = document.location;