diff --git a/lib/modules/Calendar.pmod/Events.pmod b/lib/modules/Calendar.pmod/Events.pmod
index dcf24f06717ecf53567c93d336c3a6e3af64b483..88488cd43f3bdbea4d7354776fc24336a9adee4f 100644
--- a/lib/modules/Calendar.pmod/Events.pmod
+++ b/lib/modules/Calendar.pmod/Events.pmod
@@ -13,7 +13,7 @@ constant wd2n=(["Mon":1,"Tue":2,"Wed":3,"Thu":4,"Fri":5,"Sat":6,"Sun":7]);
 void read_all_data()
 {
    all_data=master()->master_read_file(
-      combine_path(__FILE__,"../events/regional"));
+      master()->combine_path_with_cwd(__FILE__,"../events/regional"));
 }
 
 
@@ -229,7 +229,7 @@ mapping made_namedays=([]);
 string read_all_namedays()
 {
    return master()->master_read_file(
-      combine_path(__FILE__,"../events/namedays"));
+      master()->combine_path_with_cwd(__FILE__,"../events/namedays"));
 }
 
 
diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index 2294d2f70758a4566b216d3836b3c1736f413093..9d3d7a1a96ab21003a3d9eb0760b4bd5f38e1d6e 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -32,7 +32,7 @@ string _zone_tab()
 {
    return raw_zone_tab ||
       (raw_zone_tab = ( master()->master_read_file(
-         combine_path(__FILE__,"..","tzdata/zone.tab")) - "\r"));
+         master()->combine_path_with_cwd(__FILE__,"..","tzdata/zone.tab")) - "\r"));
 }
 
 protected array(array(string)) parsed_zone_tab=0;
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 9c80b2849bf79f97b42311ac673bf2509b0f8e30..10c2ff33fda9374b915d151c4a152c03fdcb553f 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -1305,7 +1305,7 @@ class Runtime_timezone_compiler
 
    }
 
-   string base_path=combine_path(__FILE__,"../tzdata/");
+   string base_path=master()->combine_path_with_cwd(__FILE__,"../tzdata/");
    array files=
    ({
       "africa",