diff --git a/setup/xampp.php b/setup/xampp.php
index 34cf385ea0..ba0d4b70c9 100644
--- a/setup/xampp.php
+++ b/setup/xampp.php
@@ -1,115 +1,138 @@
-<?PHP echo file_get_contents("page_top");
+<?php
+/**
+ * XOT installer for XAMP type  users.
+ * It assumes that :
+ * - The database server is accessible on localhost, port 3306 with no password (user=root)
+ * - The database to be created is called toolkits_data
+ *
+ */
+echo file_get_contents("page_top");
 
-	$mysql_connect_id = mysql_connect("localhost", "root", "");
+$mysql_connect_id = mysql_connect("localhost", "root", "");
 
-	// Check for connection and error if failed
+// Check for connection and error if failed
 
-	if(!$mysql_connect_id){
+if(!$mysql_connect_id){
 
-		?>
+?>
 
-		<p>Sorry, the attempt to connect to the host has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
+        <p>Sorry, the attempt to connect to the host has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
 
-		<?PHP }
+<?PHP }
 
-	$query = "create database if not exists toolkits_data";
-	
-	$query_response = mysql_query($query);			
+$query = "create database if not exists toolkits_data";
 
-	if($query_response){
+$query_response = mysql_query($query);			
 
+if($query_response){
 
-	}else{
 
-		?>
+}else{
 
-		<p>Sorry, the attempt to create the database to the database has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id);?></p>
+?>
 
-		<?PHP }
+        <p>Sorry, the attempt to create the database to the database has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id);?></p>
 
-	$query = "USE toolkits_data";
+<?PHP }
 
-	$query_response = mysql_query($query);			
+$query = "USE toolkits_data";
 
-	if($query_response){
+$query_response = mysql_query($query);			
 
+if($query_response){
 
-	}else{
 
-		?>
+}else{
 
-		<p>Sorry, the attempt to specify which database we need to work on (the MySQL keyword - USE) has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); echo "The query response was " . $query_response . "<br>"; ?></p>
+?>
 
-		<?PHP }
+        <p>Sorry, the attempt to specify which database we need to work on (the MySQL keyword - USE) has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); echo "The query response was " . $query_response . "<br>"; ?></p>
 
-	$temp = explode(";",file_get_contents("basic.sql")); 
+<?PHP }
 
-	$x=0;
+$temp = explode(";",file_get_contents("basic.sql")); 
 
-	while($x!=count($temp)){
+$x=0;
 
-		$query = str_replace("$","",ltrim($temp[$x++]));
+while($x!=count($temp)){
 
-		if($query!=""){
-		
-			$query_response = mysql_query($query);			
+    $query = str_replace("$","",ltrim($temp[$x++]));
 
-		}
+    if($query!=""){
 
-		if($query_response){
+        $query_response = mysql_query($query);			
 
+    }
 
-		}else{
+    if($query_response){
 
-			?>
 
-				<p>Sorry, The query <?PHP echo $query;  ?> has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
+    }else{
 
-			<?PHP }
+?>
 
+                <p>Sorry, The query <?PHP echo $query;  ?> has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
 
-	}
+<?PHP }
 
 
-	$temp = file_get_contents("xampp.txt"); 
+}
 
-	$query_2 = substr($temp,3);
-		
-	$query_response = mysql_query($query_2);			
 
-	if($query_response){
+$temp = file_get_contents("xampp.txt"); 
 
+$query_2 = substr($temp,3);
 
-	}else{
+$query_response = mysql_query($query_2);			
 
-		?>
+if($query_response){
 
-			<p>Sorry, The query <?PHP echo $query;  ?> has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
 
-		<?PHP }
+}else{
 
+?>
 
-	/*
-	* Create the database
-	*/
+            <p>Sorry, The query <?PHP echo $query;  ?> has failed. MySQL reports the following error - <?PHP echo mysql_errno($mysql_connect_id) . " - " . mysql_error($mysql_connect_id); ?></p>
 
-	$buffer = file_get_contents("xampp_database.txt");
-	$file_handle = fopen("../database.php",'w');
-	fwrite($file_handle,$buffer,strlen($buffer));
-	fclose($file_handle);
+<?PHP }
 
-	rename("../index.php","../index.txt");
 
-	rename("../demo.txt","../index.php");
+/*
+ * Create the database
+ */
 
+$buffer = file_get_contents("xampp_database.txt");
+$file_handle = fopen("../database.php",'w');
+fwrite($file_handle,$buffer,strlen($buffer));
+fclose($file_handle);
 
-	?>
+if(!is_writeable('../index.php')) {
+    echo "Check your file permissions, index.php file is not writeable by the web server; you will want to replace index.php with demo.txt";
+}
+if(is_file('../index.php') && is_writeable('../index.php')) {
+    @copy("../index.php","../index.txt");
+    if(copy("../demo.txt","../index.php")) {
+        echo "<p>Login requirement removed; using demo.txt as index.php page (index.php -&gt; index.txt && demo.txt -&gt index.php).</p>";
+    }
+}
 
-		<h2 style="margin-top:15px">
-			Toolkits has been installed.</h2><p> Please go to <a href="http://localhost/xertetoolkits/">http://localhost/xertetoolkits/</a>
-		</p>
-		<p>
-			Please see the Xerte site at <a href="http://www.nottingham.ac.uk/xerte" target="new">http://www.nottingham.ac.uk/xerte</a> and please consider joining the mailing list.
-		</p>
+// update DB so it should work on Windows and OSX installs - rather than being hard coded to WAMP installs...
+$site_url = 'http://' . $_SERVER['HTTP_HOST'] . dirname(dirname($_SERVER['REQUEST_URI']));
+
+$db_site_url = mysql_real_escape_string($site_url);
+mysql_query("UPDATE sitedetails SET site_url = '$db_site_url/' WHERE site_id = 1");
+
+$home = realpath(dirname(dirname(__FILE__)));
+$db_root_file_path = mysql_real_escape_string($home);
+$db_import_path = mysql_real_escape_string($home . DIRECTORY_SEPARATOR . 'import' . DIRECTORY_SEPARATOR);
+mysql_query("UPDATE sitedetails SET root_file_path = '$db_root_file_path/' WHERE site_id = 1");
+mysql_query("UPDATE sitedetails SET import_path = '$db_import_path/' WHERE site_id = 1");
+
+?>
+        <h2 style="margin-top:15px">
+        Toolkits has been installed.</h2><p> Please go to <a href="<?php echo $site_url; ?>"><?php echo $site_url; ?></a> </p>
+        <p>
+            Please see the Xerte site at <a href="http://www.nottingham.ac.uk/xerte" target="new">http://www.nottingham.ac.uk/xerte</a> and please consider joining the mailing list.
+        </p>
 </body>
-</html>
\ No newline at end of file
+</html>