diff --git a/CHANGELOG.md b/CHANGELOG.md
index e177f728..51b037db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Features
 Bug Fixes
 
 - Fix `read-line` to remove trailing carriage return and/or newline characters. Thanks to wasamasa for the bug report!
+- Added a fix from wasamasa to escape double quotation marks in strings when output via `write`.
 
 ## 0.6.2 - August 25, 2017
 
diff --git a/runtime.c b/runtime.c
index 8823fdb3..473c2b73 100644
--- a/runtime.c
+++ b/runtime.c
@@ -1019,6 +1019,7 @@ static object _Cyc_write(void *data, object x, FILE * port)
       case '\t': fprintf(port, "\\t"); break;
       case '\v': fprintf(port, "\\v"); break;
       case '\\': fprintf(port, "\\\\"); break;
+      case '\"': fprintf(port, "\\\""); break;
       default:
         fputc(*s, port);
         break;