diff --git a/src/ikarus.boot b/src/ikarus.boot
index fbb9b45..49d0972 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/makefile.ss b/src/makefile.ss
index bf41f4f..8b5a99a 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -132,6 +132,7 @@
     [trace-lambda      (macro . trace-lambda)]
     [trace-define      (macro . trace-define)]
     [eol-style         (macro . eol-style)]
+    [error-handling-mode (macro . error-handling-mode)]
     ))
 
 (define library-legend
@@ -965,7 +966,7 @@
     [scheme-report-environment                   r5 se]
     [close-port                                  r ip]
     [eol-style                                   i r ip]
-    [error-handling-mode                         r ip]
+    [error-handling-mode                         i r ip]
     [file-options                                r ip]
     [flush-output-port                           i r ip]
     [get-bytevector-all                          r ip]
diff --git a/src/psyntax.expander.ss b/src/psyntax.expander.ss
index 532f369..83560c6 100644
--- a/src/psyntax.expander.ss
+++ b/src/psyntax.expander.ss
@@ -1914,6 +1914,9 @@
            ((eol-style)         
             (lambda (x) 
               (symbol-macro x '(none lf cr crlf nel crnel ls))))
+           ((error-handling-mode)         
+            (lambda (x) 
+              (symbol-macro x '(ignore raise replace))))
            ((... => _ else unquote unquote-splicing
              unsyntax unsyntax-splicing)
             incorrect-usage-macro)
diff --git a/src/todo-r6rs.ss b/src/todo-r6rs.ss
index 74b5a37..f2e43cb 100755
--- a/src/todo-r6rs.ss
+++ b/src/todo-r6rs.ss
@@ -545,7 +545,7 @@
     ;;;
     [close-port                                 S ip]
     [eol-style                                  C ip]
-    [error-handling-mode                        S ip]
+    [error-handling-mode                        C ip]
     [file-options                               S ip]
     [flush-output-port                          S ip]
     [get-bytevector-all                         S ip]