diff --git a/NEWS b/NEWS
index 9d4560d4a..1e5a44abe 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,7 @@ would trigger an unbound variable error for `match:andmap'.
 Previously, parsing short option names of argument-less options would
 lead to a stack overflow.
 
+** `(srfi srfi-35)' is now visible through `cond-expand'
 ** Fixed type-checking for the second argument of `eval'
 ** Fixed `struct-ref' and `struct-set!' on "light structs"
 ** Honor struct field access rights in GOOPS
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index cd696de63..6343dd73a 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Ludovic Courtès  <ludo@gnu.org>
+
+	* srfi-35.scm: Provide `srfi-35' through `cond-expand-provide'.
+
 2008-04-26  Ludovic Courtès  <ludo@gnu.org>
 
 	* Makefile.am (srfi_DATA): Add `srfi-88.scm'.
diff --git a/srfi/srfi-35.scm b/srfi/srfi-35.scm
index c9e25ce12..203546625 100644
--- a/srfi/srfi-35.scm
+++ b/srfi/srfi-35.scm
@@ -1,6 +1,6 @@
 ;;; srfi-35.scm --- Conditions
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -37,6 +37,8 @@
             &serious serious-condition?
             &error error?))
 
+(cond-expand-provide (current-module) '(srfi-35))
+
 
 ;;;
 ;;; Condition types.
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 9a2a63a97..67c28035d 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Ludovic Courtès  <ludo@gnu.org>
+
+	* tests/srfi-35.test (cond-expand): New test.
+
 2008-04-26  Ludovic Courtès  <ludo@gnu.org>
 
 	* Makefile.am (SCM_TESTS): Add `tests/srfi-88.test'.
diff --git a/test-suite/tests/srfi-35.test b/test-suite/tests/srfi-35.test
index ec7a104c3..83efd61d9 100644
--- a/test-suite/tests/srfi-35.test
+++ b/test-suite/tests/srfi-35.test
@@ -1,7 +1,7 @@
 ;;;; srfi-35.test --- Test suite for SRFI-35               -*- Scheme -*-
 ;;;; Ludovic Courtès <ludo@gnu.org>
 ;;;;
-;;;; 	Copyright (C) 2007 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 ;;;;
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -22,6 +22,12 @@
   :use-module (test-suite lib)
   :use-module (srfi srfi-35))
 
+
+(with-test-prefix "cond-expand"
+  (pass-if "srfi-35"
+    (cond-expand (srfi-35 #t)
+                 (else    #f))))
+
 
 (with-test-prefix "condition types"
   (pass-if "&condition"
@@ -308,3 +314,7 @@
   (pass-if "(c2-b v5)"
     (equal? (c2-b v5) "b2")))
 
+
+;;; Local Variables:
+;;; coding: latin-1
+;;; End: