diff --git a/ChangeLog b/ChangeLog
index f7f356b8d..2df28f246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@ danbarry
 + [pdf] Merged tcpdf 2.2.002 (PHP5 version), thanks to Nicola Asuni 
 + [engines] Maria support 
 + [engines] MyISAM and InnoDB: support ROW_FORMAT table option 
++ prevent search indexes from indexing phpMyAdmin installations
 
 2.11.6.0 (not yet released)
 - bug #1903724 [interface] Displaying of very large queries in error message
diff --git a/index.php b/index.php
index ca31e2419..007fb5296 100644
--- a/index.php
+++ b/index.php
@@ -110,6 +110,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     <?php echo htmlspecialchars($HTTP_HOST); ?></title>
 <meta http-equiv="Content-Type"
     content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
+<meta name="robots" content="noindex,nofollow" />
 <script type="text/javascript">
 // <![CDATA[
     // definitions used in common.js
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 12cc1313d..36d9f08c2 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -44,3 +44,4 @@ if ($GLOBALS['text_dir'] == 'ltr') {
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
+    <meta name="robots" content="noindex,nofollow" />
\ No newline at end of file
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 000000000..c2aab7e03
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
\ No newline at end of file