diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 71b83b7126..37fe9d49ef 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,6 @@
 2006-11-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* wrapup/Makefile.am: Introduce AM_CONDITIONAL(LIBDOSFS).
 	* configure.ac, Makefile.am, libfs/Makefile.am:
 	Introduce AM_CONDITIONAL(LIBDOSFS).
 
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 1ff4a1d3af..c59ea66679 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -28,6 +28,8 @@ endif
 TMP_LIBS += ../libcsupport/libcsupport.a
 if !UNIX
 TMP_LIBS += ../libblock/libblock.a
+endif
+if LIBDOSFS
 TMP_LIBS += ../libfs/libdosfs.a
 endif
 TMP_LIBS += ../libfs/libimfs.a