diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 23e0cc9f48..f466696f16 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03	Chris Johns <chrisj@rtems.org>
+
+	* sapi/include/confdefs.h: PR 1543. Make default file system when
+	nothing is defined IMFS not miniIMFS.
+
 2010-06-01 	Chris Johns <chrisj@rtems.org>
 
 	* libcsupport/include/rtems/libio.h: Make the struct name the same
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index aa6ec8932e..4fb17f8c2e 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -447,12 +447,12 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
 
   #ifndef CONFIGURE_HAS_OWN_MOUNT_TABLE
     const rtems_filesystem_mount_table_t configuration_mount_table = {
-      #ifdef CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-        "imfs",
-      #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
+      #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
         "devfs",
-      #else  /* using miniIMFS as base filesystem */
+      #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
         "mimfs",
+      #else  /* using IMFS as base filesystem */
+        "imfs",
       #endif
       RTEMS_FILESYSTEM_READ_WRITE,
       NULL,