diff --git a/server/cron_daily.php b/server/cron_daily.php
index 1ec0ac258bc2da077806f810dbe123788a02d0eb..74879716234b493afd00e18720a982a071bd0470 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -28,8 +28,9 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-require('lib/config.inc.php');
-require('lib/app.inc.php');
+define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
+require(SCRIPT_PATH."/lib/config.inc.php");
+require(SCRIPT_PATH."/lib/app.inc.php");
 
 set_time_limit(0);
 
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index d9af3a7d6aba66d4faa02ac5ba456b3f62cc4bf8..1f6ab09982db03a00f4868d27e29e1725ee6dbc6 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -95,7 +95,7 @@ class remoteaction_core_module {
 		 * stop a service, a admin stopped some days before! To avoid this, we ignore
 		 * the status (it is only for the interface to show) and use our own maxid
 		*/
-		include_once (dirname(__FILE__) .  "/../lib/remote_action.inc.php");
+		include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
 
 		/*
 		 * Get all actions this server should execute
@@ -243,4 +243,4 @@ class remoteaction_core_module {
 		//$this->_actionDone($action['action_id'], 'ok');
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/server/server.php b/server/server.php
index 967d13a6142d4c4fe3533a3f92ca6a2b148e0bb3..c5ff5ac2f3f823a3cafaac1699c4258b0b3a9e09 100644
--- a/server/server.php
+++ b/server/server.php
@@ -27,11 +27,9 @@
   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// $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");
+define('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);
diff --git a/server/server.sh b/server/server.sh
old mode 100644
new mode 100755