diff -u -r ocs-old/include/footer.inc.php ocs/include/footer.inc.php
--- ocs-old/include/footer.inc.php	2004-01-11 03:40:18.000000000 +0100
+++ ocs/include/footer.inc.php	2006-10-22 12:49:34.000000000 +0200
@@ -26,6 +26,8 @@
 // 
 // prints out the site-wide footer
 
+// Correct bug #2436
+$fullpath = preg_replace("/include$/", "", dirname(__FILE__)) . "/";
 
 // include theme file
 include_once($fullpath."include/theme.inc.php");
@@ -34,4 +36,4 @@
 // print out the footer
 theme_footer();
 
-?>
\ No newline at end of file
+?>
diff -u -r ocs-old/include/header.inc.php ocs/include/header.inc.php
--- ocs-old/include/header.inc.php	2004-01-11 03:40:18.000000000 +0100
+++ ocs/include/header.inc.php	2006-10-22 12:49:32.000000000 +0200
@@ -26,6 +26,9 @@
 // 
 // prints out the site-wide header
 
+// Correct bug #2449
+$fullpath = preg_replace("/include$/", "", dirname(__FILE__)) . "/";
+
 
 // include theme file
 include_once($fullpath."include/theme.inc.php");
diff -u -r ocs-old/include/theme.inc.php ocs/include/theme.inc.php
--- ocs-old/include/theme.inc.php	2004-01-11 03:40:18.000000000 +0100
+++ ocs/include/theme.inc.php	2006-10-22 12:49:34.000000000 +0200
@@ -26,6 +26,9 @@
 // 
 // include theme stuff
 
+// Correct bug #2436
+$fullpath = preg_replace("/include$/", "", dirname(__FILE__)) . "/";
+
 if(!$theme || !file_exists($fullpath."themes/$theme/theme.inc.php")) { $theme = "Default"; }
 
 $themesdir = $basedir."themes/$theme/";
@@ -36,4 +39,4 @@
 // get filename of this page
 $this_page = str_replace("$basedir","",$PHP_SELF);
 
-?>
\ No newline at end of file
+?>