diff --git a/htdocs/application/config/routes.php b/htdocs/application/config/routes.php
index 1aa6b26..864e891 100644
--- a/htdocs/application/config/routes.php
+++ b/htdocs/application/config/routes.php
@@ -66,6 +66,7 @@ $route['iphone/:num'] = 'iphone';
 $route['iphone/view/:any'] = 'iphone/view';
 
 $route['404_override'] = 'main/error_404';
+$route['robots.txt'] = 'main/robots_txt';
 
 $route['themes/:any/css/:any'] = 'theme_assets/css';
 $route['themes/:any/images/:any'] = 'theme_assets/images';
diff --git a/htdocs/application/config/stikked.php.dist b/htdocs/application/config/stikked.php.dist
index ddadabf..ffe1d4f 100644
--- a/htdocs/application/config/stikked.php.dist
+++ b/htdocs/application/config/stikked.php.dist
@@ -132,6 +132,7 @@ $config['recaptcha_privatekey'] = '';
 $config['disable_api'] = false;
 $config['blocked_words'] = '';
 $config['disable_shorturl'] = false;
+$config['disallow_search_engines'] = false;
 
 //spamadmin: accessible via /spamadmin (only active when user + pass is set)
 $config['spamadmin_user'] = '';
diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index de2c4ba..acc6e8f 100644
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -27,6 +27,7 @@
  * - _valid_authentication()
  * - get_cm_js()
  * - error_404()
+ * - robots_txt()
  * Classes list:
  * - Main extends CI_Controller
  */
@@ -260,12 +261,16 @@ class Main extends CI_Controller
 		
 		if ($fields[1]->max_length < 45) 
 		{
-			if($this->db->dbdriver == "postgre"){
+			
+			if ($this->db->dbdriver == "postgre") 
+			{
 				$this->db->query("ALTER TABLE trending ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
 				$this->db->query("ALTER TABLE pastes ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
 				$this->db->query("ALTER TABLE blocked_ips ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
 				$this->db->query("ALTER TABLE ci_sessions ALTER COLUMN ip_address TYPE VARCHAR(45), ALTER COLUMN ip_address SET NOT NULL, ALTER COLUMN ip_address SET DEFAULT '0'");
-			} else {
+			}
+			else
+			{
 				$this->db->query("ALTER TABLE trending CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
 				$this->db->query("ALTER TABLE pastes CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
 				$this->db->query("ALTER TABLE blocked_ips CHANGE COLUMN ip_address ip_address VARCHAR(45) NOT NULL DEFAULT '0'");
@@ -408,8 +413,8 @@ class Main extends CI_Controller
 				{
 					$_POST['private'] = 1;
 				}
-
-				if (config_item('disable_shorturl'))
+				
+				if (config_item('disable_shorturl')) 
 				{
 					$_POST['snipurl'] = 0;
 				}
@@ -859,4 +864,18 @@ class Main extends CI_Controller
 	{
 		show_404();
 	}
+	
+	function robots_txt() 
+	{
+		
+		if (config_item('disallow_search_engines')) 
+		{
+			header('Content-Type: text/plain; charset=utf-8');
+			$this->load->view('robots_txt');
+		}
+		else
+		{
+			echo '';
+		}
+	}
 }
diff --git a/htdocs/robots.txt b/htdocs/robots.txt
deleted file mode 100644
index e4c7219..0000000
--- a/htdocs/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# http://www.robotstxt.org/
-User-agent: *
-Disallow: /
diff --git a/htdocs/themes/default/views/robots_txt.php b/htdocs/themes/default/views/robots_txt.php
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/htdocs/themes/default/views/robots_txt.php
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /