diff --git a/ChangeLog b/ChangeLog
index 47f429d4ff..3fb20f7ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - issue #12325 Setup script icons broken
 
 4.6.4 (not yet released)
+- issue        Include X-Robots-Tag header in responses
 
 4.6.3 (2016-06-23)
 - issue #12249 Fixed cookie path on Windows
diff --git a/libraries/Header.php b/libraries/Header.php
index c5f72ddccd..331ef69e60 100644
--- a/libraries/Header.php
+++ b/libraries/Header.php
@@ -606,6 +606,11 @@ class Header
         header(
             'X-Permitted-Cross-Domain-Policies: none'
         );
+        // Robots meta tag
+        // see https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+        header(
+            'X-Robots-Tag: noindex, nofollow'
+        );
         PMA_noCacheHeader();
         if (! defined('IS_TRANSFORMATION_WRAPPER')) {
             // Define the charset to be used