diff --git a/build/bakefiles/compat/README b/build/bakefiles/compat/README
deleted file mode 100644
index 219dbea6e3..0000000000
--- a/build/bakefiles/compat/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This is Bakefile backend that generates wx2.4-compatible VC++ project file
-(src/wxWindows.dsp).
diff --git a/build/bakefiles/compat/FORMATS.bkmanifest b/build/bakefiles/formats/FORMATS.bkmanifest
similarity index 57%
rename from build/bakefiles/compat/FORMATS.bkmanifest
rename to build/bakefiles/formats/FORMATS.bkmanifest
index ad0390a52c..6f7448d497 100644
--- a/build/bakefiles/compat/FORMATS.bkmanifest
+++ b/build/bakefiles/formats/FORMATS.bkmanifest
@@ -9,4 +9,11 @@
         <default-filename>wxWindows.dsp</default-filename>
     </format>
     
+    <format id="rpmspec">
+        <description>
+            wxBase headers list in wx{GTK,Motif,X11}.spec
+        </description>
+        <default-filename>wxWindows.dsp</default-filename>
+    </format>
+    
 </bakefile-manifest>
diff --git a/build/bakefiles/formats/README b/build/bakefiles/formats/README
new file mode 100644
index 0000000000..d21a6a4f9b
--- /dev/null
+++ b/build/bakefiles/formats/README
@@ -0,0 +1,5 @@
+
+This directory contains misc Bakefile backends that are wxWindows-specific:
+
+wx24dsp     - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
+rpmspec     - generates part of .spec files with list of wxBase headers
diff --git a/build/bakefiles/compat/wx24dsp.bkl b/build/bakefiles/formats/__fake.bkl
similarity index 85%
rename from build/bakefiles/compat/wx24dsp.bkl
rename to build/bakefiles/formats/__fake.bkl
index b5e4818a5f..7c82dd6859 100644
--- a/build/bakefiles/compat/wx24dsp.bkl
+++ b/build/bakefiles/formats/__fake.bkl
@@ -1,10 +1,13 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 
-<makefile>
+<!--
+Contains rule definitions that Bakefile requires in every format, implemented
+as empty stubs. This is used by our private formats that don't generate real
+makefiles, e.g. wx24dsp or rpmspec ones.
+-->
 
-    <include file="win32.bkl"/>
-    <set var="COMPILER">vc</set>
+<makefile>
 
     <define-rule name="__fake">
         <define-tag name="sources"/>
@@ -50,14 +53,5 @@
     <define-rule name="action" extends="__fake"/>
     <define-rule name="phony" extends="__fake"/>
     <define-rule name="subproject" extends="__fake"/>
-
-    <set var="ALL_SOURCES" eval="0">
-        $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
-    </set>
-    
-    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
-    <set var="FORMAT_OUTPUT_VARIABLES">
-        ALL_SOURCES,ALL_HEADERS
-    </set>   
     
 </makefile>
diff --git a/build/bakefiles/formats/wx24dsp.bkl b/build/bakefiles/formats/wx24dsp.bkl
new file mode 100644
index 0000000000..955a942587
--- /dev/null
+++ b/build/bakefiles/formats/wx24dsp.bkl
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="win32.bkl"/>
+    <set var="COMPILER">vc</set>
+    <include file="__fake.bkl"/>
+
+    <set var="ALL_SOURCES" eval="0">
+        $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
+    </set>
+    
+    <output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
+    <set var="FORMAT_OUTPUT_VARIABLES">
+        ALL_SOURCES,ALL_HEADERS
+    </set>   
+    
+</makefile>
diff --git a/build/bakefiles/compat/wx24dsp.empy b/build/bakefiles/formats/wx24dsp.empy
similarity index 100%
rename from build/bakefiles/compat/wx24dsp.empy
rename to build/bakefiles/formats/wx24dsp.empy