diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bcdfddf641..3d1f087bfe 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libfs/src/pipe/fifo.c: Actually disable initializing pipes as
+	requested in confdefs.h.
+
 2008-12-01	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sapi/include/confdefs.h: Add disable of pipes by default since they
diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c
index 1c194c2030..812c824db3 100644
--- a/cpukit/libfs/src/pipe/fifo.c
+++ b/cpukit/libfs/src/pipe/fifo.c
@@ -22,6 +22,7 @@
 
 extern uint16_t rtems_pipe_no;
 static rtems_id rtems_pipe_semaphore = 0;
+extern bool rtems_pipe_configured;
 
 
 #define PIPE_EMPTY(_pipe) (_pipe->Length == 0)
@@ -534,6 +535,9 @@ int pipe_lseek(
  */
 void rtems_pipe_initialize (void)
 {
+  if (!rtems_pipe_configured)
+    return;
+
   if (rtems_pipe_semaphore)
     return;