diff --git a/scheme/ikarus.boot.prebuilt b/scheme/ikarus.boot.prebuilt
index 8e252a9..576f900 100644
Binary files a/scheme/ikarus.boot.prebuilt and b/scheme/ikarus.boot.prebuilt differ
diff --git a/scheme/last-revision b/scheme/last-revision
index f8d65c3..b053645 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1204
+1205
diff --git a/scheme/makefile.ss b/scheme/makefile.ss
index f3e1f67..38ac191 100755
--- a/scheme/makefile.ss
+++ b/scheme/makefile.ss
@@ -1024,8 +1024,8 @@
     [buffer-mode?                                i r ip]
     [bytevector->string                          r ip]
     [call-with-bytevector-output-port            i r ip]
-    [call-with-port                              r ip]
-    [call-with-string-output-port                r ip]
+    [call-with-port                              i r ip]
+    [call-with-string-output-port                i r ip]
     [assoc                                       i r ls se]
     [assp                                        i r ls]
     [assq                                        i r ls se]
@@ -1066,14 +1066,14 @@
     [error-handling-mode                         i r ip]
     [file-options                                i r ip]
     [flush-output-port                           i r ip]
-    [get-bytevector-all                          r ip]
+    [get-bytevector-all                          i r ip]
     [get-bytevector-n                            i r ip]
     [get-bytevector-n!                           i r ip]
     [get-bytevector-some                         r ip]
     [get-char                                    i r ip]
     [get-datum                                   i r ip]
     [get-line                                    i r ip]
-    [get-string-all                              r ip]
+    [get-string-all                              i r ip]
     [get-string-n                                i r ip]
     [get-string-n!                               i r ip]
     [get-u8                                      i r ip]
@@ -1105,11 +1105,11 @@
     [i/o-read-error?                             i r ip is fi]
     [&i/o-write                                  i r ip is fi]
     [i/o-write-error?                            i r ip is fi]
-    [lookahead-char                              r ip]
+    [lookahead-char                              i r ip]
     [lookahead-u8                                i r ip]
     [$lookahead-u8                               $io]
     [make-bytevector                             i r bv]
-    [make-custom-binary-input-port               r ip]
+    [make-custom-binary-input-port               i r ip]
     [make-custom-binary-input/output-port        r ip]
     [make-custom-binary-output-port              r ip]
     [make-custom-textual-input-port              r ip]
@@ -1134,17 +1134,17 @@
     [transcoder?                                 i]
     [open-bytevector-input-port                  i r ip]
     [open-bytevector-output-port                 i r ip]
-    [open-file-input-port                        r ip]
+    [open-file-input-port                        i r ip]
     [open-file-input/output-port                 r ip]
     [open-file-output-port                       i r ip]
     [open-string-input-port                      i r ip]
     [open-string-output-port                     i r ip]
     [output-port-buffer-mode                     r ip]
-    [port-eof?                                   r ip]
+    [port-eof?                                   i r ip]
     [port-has-port-position?                     r ip]
     [port-has-set-port-position!?                r ip]
     [port-position                               r ip]
-    [port-transcoder                             r ip]
+    [port-transcoder                             i r ip]
     [port?                                       i r ip]
     [put-bytevector                              i r ip]
     [put-char                                    i r ip]
diff --git a/scheme/todo-r6rs.ss b/scheme/todo-r6rs.ss
index a1bd5b4..bcf4e9f 100755
--- a/scheme/todo-r6rs.ss
+++ b/scheme/todo-r6rs.ss
@@ -563,14 +563,14 @@
     [error-handling-mode                        C ip]
     [file-options                               C ip]
     [flush-output-port                          C ip]
-    [get-bytevector-all                         S ip]
+    [get-bytevector-all                         C ip]
     [get-bytevector-n                           C ip]
     [get-bytevector-n!                          C ip]
     [get-bytevector-some                        S ip]
     [get-char                                   C ip]
     [get-datum                                  C ip]
     [get-line                                   C ip]
-    [get-string-all                             S ip]
+    [get-string-all                             C ip]
     [get-string-n                               C ip]
     [get-string-n!                              C ip]
     [get-u8                                     C ip]
@@ -601,10 +601,10 @@
     [i/o-read-error?                            C ip is fi]
     [&i/o-write                                 C ip is fi]
     [i/o-write-error?                           C ip is fi]
-    [lookahead-char                             S ip]
-    [lookahead-u8                               S ip]
+    [lookahead-char                             C ip]
+    [lookahead-u8                               C ip]
     [make-bytevector                            C bv]
-    [make-custom-binary-input-port              S ip]
+    [make-custom-binary-input-port              C ip]
     [make-custom-binary-input/output-port       S ip]
     [make-custom-binary-output-port             S ip]
     [make-custom-textual-input-port             S ip]
@@ -626,11 +626,11 @@
     [make-transcoder                            C ip]
     [native-eol-style                           C ip]
     [native-transcoder                          C ip]
-    [open-bytevector-input-port                 S ip]
-    [open-bytevector-output-port                S ip]
-    [open-file-input-port                       S ip]
+    [open-bytevector-input-port                 C ip]
+    [open-bytevector-output-port                C ip]
+    [open-file-input-port                       C ip]
     [open-file-input/output-port                S ip]
-    [open-file-output-port                      S ip]
+    [open-file-output-port                      C ip]
     [open-string-input-port                     C ip]
     [open-string-output-port                    C ip]
     [output-port-buffer-mode                    S ip]
@@ -638,7 +638,7 @@
     [port-has-port-position?                    S ip]
     [port-has-set-port-position!?               S ip]
     [port-position                              S ip]
-    [port-transcoder                            S ip]
+    [port-transcoder                            C ip]
     [port?                                      C ip]
     [put-bytevector                             C ip]
     [put-char                                   C ip]
@@ -650,8 +650,8 @@
     [standard-input-port                        C ip]
     [standard-output-port                       C ip]
     [string->bytevector                         S ip]
-    [textual-port?                              S ip]
-    [transcoded-port                            S ip]
+    [textual-port?                              C ip]
+    [transcoded-port                            C ip]
     [transcoder-codec                           C ip]
     [transcoder-eol-style                       C ip]
     [transcoder-error-handling-mode             C ip]