diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index fc23f6f8f3..c8793dd3c5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libcsupport/include/rtems/libio.h: Add extern "C" {}.
+
 2006-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* posix/src/mqueue.c: Remove duplicate #include <limits.h>.
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index 617cc41ec8..4b5e000bea 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -34,6 +34,10 @@
 
 #include <rtems/fs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Valid RTEMS file types.
  */
@@ -634,4 +638,8 @@ typedef struct {
 extern rtems_filesystem_mount_table_t *rtems_filesystem_mount_table;
 extern int                             rtems_filesystem_mount_table_size;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTEMS_LIBIO_H */