diff --git a/.gitignore b/.gitignore
index 5677b8da..42b90a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ GameEngine/config.php
 # Ignore generated prevention and notes
 GameEngine/Prevention/*
 GameEngine/Notes/*
+
+# Install instalation_done marker left by install script
+install/installation_done
diff --git a/install/index.php b/install/index.php
index 17572f19..892ad921 100755
--- a/install/index.php
+++ b/install/index.php
@@ -83,7 +83,11 @@ function proceed() {
 				<?php
 				if(substr(sprintf('%o', fileperms('../')), -4)<'700'){
 					echo"<span class='f18 c5'>ERROR!</span><br />It's not possible to write the config file. Change the permission to '777'. After that, refresh this page!";
-				} else
+				} 
+				else if (file_exists("installation_done")) {
+					echo"<span class='f18 c5'>ERROR!</span><br />Installation appears to have been completed.<br />If this is an error remove installation_done file in install directory.";
+				}
+				else
 					switch($_GET['s']){
 						case 0:
 						include("templates/greet.tpl");
diff --git a/install/templates/end.tpl b/install/templates/end.tpl
index dc099760..9c087704 100755
--- a/install/templates/end.tpl
+++ b/install/templates/end.tpl
@@ -24,6 +24,7 @@ All the files are placed. The database is created, so you can now start playing
 <?php include("../GameEngine/config.php"); 
 $time = time();
 rename("../install/","../installed_".$time);
+touch("installation_done");
 ?>
 <p>
 <center><font size="4"><a href="<?php echo HOMEPAGE; ?>">> My TravianZ homepage <</font></a></center>