diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 4487d972fa..abc9cec7b5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-03	Roxana Leontie <roxana.leontie@gmail.com>
+
+	* Makefile.am, preinstall.am, libmisc/Makefile.am: changed the
+	references to mw_fb.h into fb.h
+	* libmisc/mw-fb/mw_fb.h: renamed fb.h
+
 2009-08-03	Roger Dahlkvist <ruppe@kth.se>
 
 	* score/cpu/Makefile.am: nios2 was not in the list.
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 846f824260..deee7c901b 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -125,7 +125,7 @@ include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h
 include_rtems_HEADERS += libmisc/monitor/monitor.h
 
 ## mw-fb
-include_rtems_HEADERS += libmisc/mw-fb/mw_fb.h libmisc/mw-fb/mw_uid.h
+include_rtems_HEADERS += libmisc/mw-fb/fb.h libmisc/mw-fb/mw_uid.h
 
 ## shell
 if LIBSHELL
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 8b9f373e41..f01c32decf 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST += monitor/README
 
 ## mw-fb
 noinst_LIBRARIES += libmw-fb.a
-libmw_fb_a_SOURCES = mw-fb/mw_uid.c mw-fb/mw_fb.h \
+libmw_fb_a_SOURCES = mw-fb/mw_uid.c mw-fb/fb.h \
     mw-fb/mw_uid.h
 
 ## shell
diff --git a/cpukit/libmisc/mw-fb/mw_fb.h b/cpukit/libmisc/mw-fb/fb.h
similarity index 100%
rename from cpukit/libmisc/mw-fb/mw_fb.h
rename to cpukit/libmisc/mw-fb/fb.h
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index d1e93699ec..dc7f21d2ab 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -234,9 +234,9 @@ $(PROJECT_INCLUDE)/rtems/monitor.h: libmisc/monitor/monitor.h $(PROJECT_INCLUDE)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/monitor.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/monitor.h
 
-$(PROJECT_INCLUDE)/rtems/mw_fb.h: libmisc/mw-fb/mw_fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_fb.h
+$(PROJECT_INCLUDE)/rtems/fb.h: libmisc/mw-fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb.h
 
 $(PROJECT_INCLUDE)/rtems/mw_uid.h: libmisc/mw-fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_uid.h