diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 97b94fedf49eaaa4372903f08efefe7d67a343f9..83702701502eedfd0d07102117465e7ad24d6573 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -57,6 +57,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
 define('ISPC_APP_VERSION', '3.0.3.3');
+define('DEVSYSTEM', 0);
 
 
 //** Database
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index fc2397cbfcc7665ad03d32e3d96e944d4588d821..a1d765d5eb44fb90acf247df57f743c22df6343f 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -75,7 +75,7 @@ class app {
 		if(is_array($cl)) {
 			foreach($cl as $classname) {
 				if(!@is_object($this->$classname)) {
-					if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+					if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM ||  !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
 						include_once($conf['classpath'].'/'.$classname.'.inc.php');
 						$this->$classname = new $classname;
 					}
@@ -91,7 +91,7 @@ class app {
 		$cl = explode(',',$classes);
 		if(is_array($cl)) {
 			foreach($cl as $classname) {
-				if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+				if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM || !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
 					include_once($conf['classpath'].'/'.$classname.'.inc.php');
 				} else {
 					die('Unable to load: '.$conf['classpath'].'/'.$classname.'.inc.php');
diff --git a/server/server.php b/server/server.php
index c171d4848907b941d75d90fa7dad106f52953480..967d13a6142d4c4fe3533a3f92ca6a2b148e0bb3 100644
--- a/server/server.php
+++ b/server/server.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
   Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh
   All rights reserved.
@@ -28,8 +27,11 @@
   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-require('lib/config.inc.php');
-require('lib/app.inc.php');
+// $script_path allows development work of using a symbolic link farm 
+// to use along side git or svn
+$script_path = dirname($_SERVER["SCRIPT_FILENAME"]);
+require("$script_path/lib/config.inc.php");
+require("$script_path/lib/app.inc.php");
 
 set_time_limit(0);
 ini_set('error_reporting', E_ALL & ~E_NOTICE);