diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index e9b879a..0c4036f 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -26,7 +26,8 @@ EXTRA_DIST=ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \
   unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \
   ikarus.io.ss ikarus.time-and-date.ss ikarus.not-yet-implemented.ss \
   ikarus.string-to-number.ss ikarus.compiler.source-optimizer.ss \
-  ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss
+  ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss \
+  ikarus.reader.annotated.ss
  
 all: $(nodist_pkglib_DATA)
 
diff --git a/scheme/Makefile.in b/scheme/Makefile.in
index d4a8f58..f5e9a6f 100644
--- a/scheme/Makefile.in
+++ b/scheme/Makefile.in
@@ -180,7 +180,8 @@ EXTRA_DIST = ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \
   unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \
   ikarus.io.ss ikarus.time-and-date.ss ikarus.not-yet-implemented.ss \
   ikarus.string-to-number.ss ikarus.compiler.source-optimizer.ss \
-  ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss
+  ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss \
+  ikarus.reader.annotated.ss
 
 revno = "$(shell sed 's/ .*//' ../.bzr/branch/last-revision 2>/dev/null)"
 sizeofvoidp = $(shell grep SIZEOF_VOID_P ../config.h | sed "s/.*\(.\)/\1/g")
diff --git a/scheme/ikarus.reader.annotated.ss b/scheme/ikarus.reader.annotated.ss
index cfa357c..265af2c 100644
--- a/scheme/ikarus.reader.annotated.ss
+++ b/scheme/ikarus.reader.annotated.ss
@@ -24,7 +24,9 @@
   (define (annotated-port file-name)
     (open-string-input-port/id
       (with-input-from-file file-name 
-        (lambda () (get-string-all (current-input-port))))
+        (lambda () 
+          (let ([x (get-string-all (current-input-port))])
+            (if (eof-object? x) "" x))))
       file-name))
 
   (define (read-library-source-file file-name)
diff --git a/scheme/last-revision b/scheme/last-revision
index 7bb9a89..59a0a5c 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1578
+1580