diff --git a/.htaccess b/.htaccess
index a980233..0152dd5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,19 +1,20 @@
### SILVERSTRIPE START ###
-
-DirectorySlash Off
-
-
-
-Order deny,allow
-Deny from all
-Allow from 127.0.0.1
-
-
-RewriteEngine On
-
-RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
-
-RewriteCond %{REQUEST_URI} ^(.*)$
-RewriteCond %{REQUEST_FILENAME} !-f
+
+DirectorySlash Off
+
+
+
+Order deny,allow
+Deny from all
+Allow from 127.0.0.1
+
+
+RewriteEngine On
+RewriteBase /phpinstaller-2.4
+
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)
+
+RewriteCond %{REQUEST_URI} ^(.*)$
+RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
### SILVERSTRIPE END ###
\ No newline at end of file
diff --git a/.mergesources.yml b/.mergesources.yml
index f3b1dff..bc71aae 100644
--- a/.mergesources.yml
+++ b/.mergesources.yml
@@ -2,6 +2,7 @@
# Keeps track of all opensource branches of submodules
# that could be merged back to the current submodule paths.
trunk:
+ .: /open/phpinstaller/trunk
sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk
\ No newline at end of file
diff --git a/mysite/_config.php b/mysite/_config.php
index ba9066a..9ac330c 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -1,18 +1,18 @@
-