diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index b77a3d8bd59e133f4a920239c85e34ef7696e1ad..048c53d62ec5ce140b5ff266cb78e04a23fbbd54 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -31,8 +31,8 @@ static string raw_zone_tab=0;
 string _zone_tab()
 {
    return raw_zone_tab ||
-      (raw_zone_tab = master()->master_read_file(
-	 combine_path(__FILE__,"..","tzdata/zone.tab")));
+      (raw_zone_tab = ( master()->master_read_file(
+         combine_path(__FILE__,"..","tzdata/zone.tab")) - "\r"));
 }
 
 static array(array(string)) parsed_zone_tab=0;
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 4672a904a8fdcd064b873cbef39eddaa782ac2a1..3cb8d2263cccdd3e1c800533fe5ce54b0c38b33d 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -1037,13 +1037,13 @@ class Runtime_timezone_compiler
 
    string get_all_rules()
    {
-      return
-	 map(files,
-	     lambda(string fn)
-	     {
-		return master()->master_read_file(base_path+fn) ||
-		   (error("Failed to open file %O\n",base_path+fn), "");
-	     })*"\n";
+     return
+       map(files,
+	   lambda(string fn)
+	   {
+	     return (master()->master_read_file(base_path+fn) ||
+		     (error("Failed to open file %O\n",base_path+fn), "")) - "\r";
+	   })*"\n";
    }
 
    class Dummymodule