diff --git a/src/boot/boot.janet b/src/boot/boot.janet
index ba67c55f..1b0cdf49 100644
--- a/src/boot/boot.janet
+++ b/src/boot/boot.janet
@@ -1080,7 +1080,7 @@
   "Read all data from a file with name path
   and then close the file."
   [path]
-  (def f (file/open path :r))
+  (def f (file/open path :rb))
   (if-not f (error (string "could not open file " path)))
   (def contents (file/read f :all))
   (file/close f)
@@ -1090,7 +1090,7 @@
   "Write contents to a file at path.
   Can optionally append to the file."
   [path contents &opt mode]
-  (default mode :w)
+  (default mode :wb)
   (def f (file/open path mode))
   (if-not f (error (string "could not open file " path " with mode " mode)))
   (file/write f contents)
@@ -1633,7 +1633,7 @@
     (defglobal "fexists" (fn fexists [path] (= :file (stat path :mode)))))
   (defglobal "fexists"
     (fn fexists [path]
-      (def f (file/open path))
+      (def f (file/open path :rb))
       (when f
         (def res
           (try (do (file/read f 1) true)
@@ -1699,7 +1699,7 @@
         :compile-only compile-only} (table ;args))
   (def f (if (= (type path) :core/file)
            path
-           (file/open path)))
+           (file/open path :rb)))
   (default env (make-env))
   (put env :current-file (string path))
   (defn chunks [buf _] (file/read f 2048 buf))
@@ -1891,7 +1891,7 @@ _fiber is bound to the suspended fiber
   # can be compiled and linked statically into the main janet library
   # and example client.
   (def chunks (string/bytes image))
-  (def image-file (file/open (process/args 1) :w))
+  (def image-file (file/open (process/args 1) :wb))
   (file/write image-file
               "#ifndef JANET_AMALG\n"
               "#include <janet.h>\n"
diff --git a/src/core/parse.c b/src/core/parse.c
index e1c43a1b..429aaaec 100644
--- a/src/core/parse.c
+++ b/src/core/parse.c
@@ -294,7 +294,7 @@ static int stringchar(JanetParser *p, JanetParseState *state, uint8_t c) {
         return stringend(p, state);
     }
     /* normal char */
-    if (c != '\n')
+    if (c != '\n' && c != '\r')
         push_buf(p, c);
     return 1;
 }
diff --git a/test/suite7.janet b/test/suite7.janet
index bebd2ffa..a7bad4d1 100644
--- a/test/suite7.janet
+++ b/test/suite7.janet
@@ -126,4 +126,8 @@
 (assert (= (type (buffer-float64-view 0)) :number) "issue #142 nanbox hijack 2")
 (assert (= (type (unmarshal @"\xC8\xbc\x9axV4\x92\xfe\xff")) :number) "issue #142 nanbox hijack 3")
 
+# Make sure Carriage Returns don't end up in doc strings.
+
+(assert (not (string/find "\r" (get ((fiber/getenv (fiber/current)) 'cond) :doc))) "no \\r in doc strings")
+
 (end-suite)