diff --git a/buildcfg.txt b/buildcfg.txt
index df71988d..93d4c695 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -185,14 +185,30 @@ MAP32
 PLAYPAL
 COLORMAP
 ENDOOM
-DEMO1
-DEMO2
-DEMO3
 GENMIDI
 ;DMXGUS
 ;DMXGUSC
 FREEDOOM
 
+#ifdef DOOM2
+
+DEMO1 = demo1_d2
+
+#else
+
+DEMO1
+
+#endif /* #ifdef DOOM2 */
+
+DEMO2
+DEMO3
+
+#ifdef ULTDOOM
+
+DEMO4
+
+#endif /* #ifdef ULTDOOM */
+
 ; boom colormaps
 
 C_START
diff --git a/lumps/demo1.lmp b/lumps/demo1_d2.lmp
similarity index 100%
rename from lumps/demo1.lmp
rename to lumps/demo1_d2.lmp