diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 6adf45be1..a81605198 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-14  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
+
+	* boot-9.scm (cond-expand): Reduce feature list to built-in
+	features.
+
 2001-05-14  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* boot-9.scm (-1+, return-it, string-character-length, flags):
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 909346062..7134743db 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2715,15 +2715,16 @@
 ;;;
 ;;; Currently, the following feature identifiers are supported:
 ;;;
-;;;   guile r5rs srfi-0 srfi-2 srfi-6 srfi-8 srfi-9 srfi-10 srfi-11 srfi-13
-;;;   srfi-14 srfi-17 srfi-19
+;;;   guile r5rs srfi-0 srfi-6
 ;;;
 ;;; Remember to update the features list when adding more SRFIs.
 
 (define-macro (cond-expand clause . clauses)
+
   (define features
-    '(guile r5rs srfi-0 srfi-2 srfi-6 srfi-8 srfi-9 srfi-10 srfi-11 srfi-13
-	    srfi-14 srfi-17 srfi-19))
+    ;; Adjust the above comment when changing this.
+    '(guile r5rs srfi-0 srfi-6))
+
   (let ((clauses (cons clause clauses))
 	(syntax-error (lambda (cl)
 			(error "invalid clause in `cond-expand'" cl))))