diff --git a/Makefile b/Makefile
index 8459dfb2..e49613c9 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ OBJS = \
 	$(WADS_DIR)/freedoom_sounds.wad   \
 	$(WADS_DIR)/freedoom_textures.wad \
 	$(WADS_DIR)/doom1.wad	          \
-	$(WADS_DIR)/doom2.wad
+	$(WADS_DIR)/doom2.wad             \
+	$(WADS_DIR)/freedm.wad
 
 # disable this for now
 #	$(WADS_DIR)/freedoom_hires.zip
@@ -43,6 +44,8 @@ textures/doom2/texture1.txt: textures/combined.txt
 	$(CPP) -DDOOM1 -DDOOM2 < $< > $@
 textures/doom/texture1.txt: textures/combined.txt
 	$(CPP) -DDOOM1 < $< > $@
+textures/freedm/texture1.txt: textures/combined.txt
+	$(CPP) -DFREEDM < $< > $@
 textures/shareware/texture1.txt: textures/combined.txt
 	$(CPP) -DSHAREWARE < $< > $@
 
@@ -64,6 +67,8 @@ wadinfo_sw.txt: buildcfg.txt force textures/shareware/pnames.txt
 	$(CPP) -P -DSHAREWARE < $< | ./wadinfo-builder.pl -dummy > $@
 wadinfo_iwad.txt: buildcfg.txt force textures/doom2/pnames.txt
 	$(CPP) -P -DDOOM2 < $< | ./wadinfo-builder.pl -dummy > $@
+wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
+	$(CPP) -P -DFREEDM < $< | ./wadinfo-builder.pl -dummy > $@
 
 %.wad.gz: %.wad
 	gzip < $< > $@
@@ -93,6 +98,14 @@ $(WADS_DIR)/freedoom.wad: wadinfo.txt subdirs force $(WADS_DIR)
 	rm -f $@
 	$(DEUTEX) $(DEUTEX_ARGS) -textures -lumps -patch -flats -sounds -musics -graphics -sprites -build wadinfo.txt $@
 
+#---------------------------------------------------------
+# freedm iwad
+
+$(WADS_DIR)/freedm.wad: wadinfo_freedm.txt subdirs force $(WADS_DIR)
+	ln -sf freedm/texture1.txt textures/texture1.txt
+	rm -f $@
+	$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_freedm.txt $@
+
 #---------------------------------------------------------
 # iwad
 
diff --git a/buildcfg.txt b/buildcfg.txt
index ea303940..3f14a9b5 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -9,6 +9,10 @@
 
 ; sanity checks: 
 
+#ifdef FREEDM
+#define DOOM2
+#endif
+
 #ifdef DOOM2
 #undef SHAREWARE
 #undef ULTDOOM
@@ -72,6 +76,43 @@ E4M9
 
 #else /* #ifndef DOOM2 */
 
+#ifdef FREEDM
+
+MAP01   = dm01
+MAP02   = dm02
+MAP03   = dm03
+MAP04   = dm04
+MAP05   = dm05
+MAP06   = dm06
+MAP07   = dm07
+MAP08   = dm08
+MAP09   = dm09
+MAP10   = dm10
+MAP11   = dm11
+MAP12   = dm12
+MAP13   = dm13
+MAP14   = dm14
+MAP15   = dm15
+MAP16   = dm16
+MAP17   = dm17
+MAP18   = dm18
+MAP19   = dm19
+MAP20   = dm20
+MAP21   = dm21
+MAP22   = dm22
+MAP23   = dm23
+MAP24   = dm24
+MAP25   = dm25
+MAP26   = dm26
+MAP27   = dm27
+MAP28   = dm28
+MAP29   = dm29
+MAP30   = dm30
+MAP31   = dm31
+MAP32   = dm32
+
+#else   /* #ifdef FREEDM */
+
 MAP01
 MAP02
 MAP03
@@ -105,6 +146,8 @@ MAP30
 MAP31
 MAP32
 
+#endif /* #ifdef FREEDM */
+
 #endif /* #ifndef DOOM2 */
 
 ; List of data Lumps
@@ -895,6 +938,337 @@ INTERPIC	0	0
 
 [sprites]
 
+#ifdef FREEDM
+
+; In FreeDM, all monster sprites are replaced with empty graphics
+
+BOS2A0     = blank
+BOS2B0     = blank
+BOS2C0     = blank
+BOS2D0     = blank
+BOS2E0     = blank
+BOS2F0     = blank
+BOS2G0     = blank
+BOS2H0     = blank
+BOS2I0     = blank
+BOS2J0     = blank
+BOS2K0     = blank
+BOS2L0     = blank
+BOS2M0     = blank
+BOS2N0     = blank
+BOS2O0     = blank
+BOSFA0     = blank
+BOSFB0     = blank
+BOSFC0     = blank
+BOSFD0     = blank
+BRS1A0     = blank
+BSPIA0     = blank
+BSPIB0     = blank
+BSPIC0     = blank
+BSPID0     = blank
+BSPIE0     = blank
+BSPIF0     = blank
+BSPIG0     = blank
+BSPIH0     = blank
+BSPII0     = blank
+BSPIJ0     = blank
+BSPIK0     = blank
+BSPIL0     = blank
+BSPIM0     = blank
+BSPIN0     = blank
+BSPIO0     = blank
+BSPIP0     = blank
+CPOSA0     = blank
+CPOSB0     = blank
+CPOSC0     = blank
+CPOSD0     = blank
+CPOSE0     = blank
+CPOSF0     = blank
+CPOSG0     = blank
+CPOSH0     = blank
+CPOSI0     = blank
+CPOSJ0     = blank
+CPOSK0     = blank
+CPOSL0     = blank
+CPOSM0     = blank
+CPOSN0     = blank
+CPOSO0     = blank
+CPOSP0     = blank
+CPOSQ0     = blank
+CPOSR0     = blank
+CPOSS0     = blank
+CPOST0     = blank
+FATBA0     = blank
+FATBB0     = blank
+FATTA0     = blank
+FATTB0     = blank
+FATTC0     = blank
+FATTD0     = blank
+FATTE0     = blank
+FATTF0     = blank
+FATTG0     = blank
+FATTH0     = blank
+FATTI0     = blank
+FATTJ0     = blank
+FATTK0     = blank
+FATTL0     = blank
+FATTM0     = blank
+FATTN0     = blank
+FATTO0     = blank
+FATTP0     = blank
+FATTQ0     = blank
+FATTR0     = blank
+FATTS0     = blank
+FATTT0     = blank
+FBXPA0     = blank
+FBXPB0     = blank
+FBXPC0     = blank
+FIREA0     = blank
+FIREB0     = blank
+FIREC0     = blank
+FIRED0     = blank
+FIREE0     = blank
+FIREF0     = blank
+FIREG0     = blank
+FIREH0     = blank
+MANFA0     = blank
+MANFB0     = blank
+PAINA0     = blank
+PAINB0     = blank
+PAINC0     = blank
+PAIND0     = blank
+PAINE0     = blank
+PAINF0     = blank
+PAING0     = blank
+PAINH0     = blank
+PAINI0     = blank
+PAINJ0     = blank
+PAINK0     = blank
+PAINL0     = blank
+PAINM0     = blank
+SKELA0     = blank
+SKELB0     = blank
+SKELC0     = blank
+SKELD0     = blank
+SKELE0     = blank
+SKELF0     = blank
+SKELG0     = blank
+SKELH0     = blank
+SKELI0     = blank
+SKELJ0     = blank
+SKELK0     = blank
+SKELL0     = blank
+SKELM0     = blank
+SKELN0     = blank
+SKELO0     = blank
+SKELP0     = blank
+SKELQ0     = blank
+SSWVA0     = blank
+SSWVB0     = blank
+SSWVC0     = blank
+SSWVD0     = blank
+SSWVE0     = blank
+SSWVF0     = blank
+SSWVG0     = blank
+SSWVH0     = blank
+SSWVI0     = blank
+SSWVJ0     = blank
+SSWVK0     = blank
+SSWVL0     = blank
+SSWVM0     = blank
+SSWVN0     = blank
+SSWVO0     = blank
+SSWVP0     = blank
+SSWVQ0     = blank
+SSWVR0     = blank
+SSWVS0     = blank
+SSWVT0     = blank
+SSWVU0     = blank
+SSWVV0     = blank
+VILEA0     = blank
+VILEB0     = blank
+VILEC0     = blank
+VILED0     = blank
+VILEE0     = blank
+VILEF0     = blank
+VILEG0     = blank
+VILEH0     = blank
+VILEI0     = blank
+VILEJ0     = blank
+VILEK0     = blank
+VILEL0     = blank
+VILEM0     = blank
+VILEN0     = blank
+VILEO0     = blank
+VILEP0     = blank
+VILEQ0     = blank
+VILER0     = blank
+VILES0     = blank
+VILET0     = blank
+VILEU0     = blank
+VILEV0     = blank
+VILEW0     = blank
+VILEX0     = blank
+VILEY0     = blank
+VILEZ0     = blank
+VILE[0     = blank
+VILE\0     = blank
+VILE]0     = blank
+BOSSA0     = blank
+BOSSB0     = blank
+BOSSC0     = blank
+BOSSD0     = blank
+BOSSE0     = blank
+BOSSF0     = blank
+BOSSG0     = blank
+BOSSH0     = blank
+BOSSI0     = blank
+BOSSJ0     = blank
+BOSSK0     = blank
+BOSSL0     = blank
+BOSSM0     = blank
+BOSSN0     = blank
+BOSSO0     = blank
+POSSA0     = blank
+POSSB0     = blank
+POSSC0     = blank
+POSSD0     = blank
+POSSE0     = blank
+POSSF0     = blank
+POSSG0     = blank
+POSSH0     = blank
+POSSI0     = blank
+POSSJ0     = blank
+POSSK0     = blank
+POSSL0     = blank
+POSSM0     = blank
+POSSN0     = blank
+POSSO0     = blank
+POSSP0     = blank
+POSSQ0     = blank
+POSSR0     = blank
+POSSS0     = blank
+POSST0     = blank
+POSSU0     = blank
+SARGA0     = blank
+SARGB0     = blank
+SARGC0     = blank
+SARGD0     = blank
+SARGE0     = blank
+SARGF0     = blank
+SARGG0     = blank
+SARGH0     = blank
+SARGI0     = blank
+SARGJ0     = blank
+SARGK0     = blank
+SARGL0     = blank
+SARGM0     = blank
+SARGN0     = blank
+SPOSA0     = blank
+SPOSB0     = blank
+SPOSC0     = blank
+SPOSD0     = blank
+SPOSE0     = blank
+SPOSF0     = blank
+SPOSG0     = blank
+SPOSH0     = blank
+SPOSI0     = blank
+SPOSJ0     = blank
+SPOSK0     = blank
+SPOSL0     = blank
+SPOSM0     = blank
+SPOSN0     = blank
+SPOSO0     = blank
+SPOSP0     = blank
+SPOSQ0     = blank
+SPOSR0     = blank
+SPOSS0     = blank
+SPOST0     = blank
+SPOSU0     = blank
+TROOA0     = blank
+TROOB0     = blank
+TROOC0     = blank
+TROOD0     = blank
+TROOE0     = blank
+TROOF0     = blank
+TROOG0     = blank
+TROOH0     = blank
+TROOI0     = blank
+TROOJ0     = blank
+TROOK0     = blank
+TROOL0     = blank
+TROOM0     = blank
+TROON0     = blank
+TROOO0     = blank
+TROOP0     = blank
+TROOQ0     = blank
+TROOR0     = blank
+TROOS0     = blank
+TROOT0     = blank
+TROOU0     = blank
+CYBRA0     = blank
+CYBRB0     = blank
+CYBRC0     = blank
+CYBRD0     = blank
+CYBRE0     = blank
+CYBRF0     = blank
+CYBRG0     = blank
+CYBRH0     = blank
+CYBRI0     = blank
+CYBRJ0     = blank
+CYBRK0     = blank
+CYBRL0     = blank
+CYBRM0     = blank
+CYBRN0     = blank
+CYBRO0     = blank
+CYBRP0     = blank
+HEADA0     = blank
+HEADB0     = blank
+HEADC0     = blank
+HEADD0     = blank
+HEADE0     = blank
+HEADF0     = blank
+HEADG0     = blank
+HEADH0     = blank
+HEADI0     = blank
+HEADJ0     = blank
+HEADK0     = blank
+HEADL0     = blank
+SKULA0     = blank
+SKULB0     = blank
+SKULC0     = blank
+SKULD0     = blank
+SKULE0     = blank
+SKULF0     = blank
+SKULG0     = blank
+SKULH0     = blank
+SKULI0     = blank
+SKULJ0     = blank
+SKULK0     = blank
+SPIDA0     = blank
+SPIDB0     = blank
+SPIDC0     = blank
+SPIDD0     = blank
+SPIDE0     = blank
+SPIDF0     = blank
+SPIDG0     = blank
+SPIDH0     = blank
+SPIDI0     = blank
+SPIDJ0     = blank
+SPIDK0     = blank
+SPIDL0     = blank
+SPIDM0     = blank
+SPIDN0     = blank
+SPIDO0     = blank
+SPIDP0     = blank
+SPIDQ0     = blank
+SPIDR0     = blank
+SPIDS0     = blank
+BBRNA0     = blank
+BBRNB0     = blank
+
+#else    /* #ifdef FREEDM */
+
 #ifdef DOOM2
 BBRNA0						; boss brain
 BBRNB0
@@ -1125,9 +1499,6 @@ FATTQ0	36	39
 FATTR0	36	39
 FATTS0	36	38
 FATTT0	36	36
-FBXPA0	19	32			; mancubus explosion
-FBXPB0	19	31
-FBXPC0	22	35
 FIREA0	21	54			; archvile fire
 FIREB0	23	61
 FIREC0	23	78
@@ -1136,12 +1507,6 @@ FIREE0	24	86
 FIREF0	25	90
 FIREG0	25	92
 FIREH0	26	95
-HDB1A0	10	83
-HDB2A0	10	83
-HDB3A0	10	59
-HDB4A0	10	59
-HDB5A0	10	59
-HDB6A0	10	59
 KEENA0	16	67			; commander keen
 KEENB0	16	67
 KEENC0	16	67
@@ -1165,10 +1530,6 @@ MANFB5	12	13
 MANFB6B4	18	19
 MANFB7B3	30	17
 MANFB8B2	27	17
-MEGAA0	12	32
-MEGAB0	12	32
-MEGAC0	12	32
-MEGAD0	12	32
 PAINA1	38	60			; pain elemental
 PAINA2A8	34	58
 PAINA3A7	35	60
@@ -1210,19 +1571,6 @@ PAINJ0	39	54
 PAINK0	46	71
 PAINL0	43	71
 PAINM0	49	88
-POB1A0
-POB2A0
-SHT2A0  -186    -89				; super shotgun
-SHT2B0  -199    -80
-SHT2C0  -204    -89
-SHT2D0  -176    -107
-SHT2E0  -180    -89
-SHT2F0  -180    -56
-SHT2G0  -178    -58
-SHT2H0  -141    -110
-SHT2I0  -174    -80
-SHT2J0  -171    -77
-SGN2A0  20      9
 SKELA1D1	16	76			; revenant
 SKELA2D8	26	77
 SKELA3D7	34	73
@@ -1354,14 +1702,6 @@ SSWVS0   27 39
 SSWVT0   27 32
 SSWVU0   27 22
 SSWVV0   27 17
-TLMPA0	11	77
-TLMPB0	11	77
-TLMPC0	11	77
-TLMPD0	11	77
-TLP2A0	10	57
-TLP2B0	10	57
-TLP2C0	10	57
-TLP2D0	10	57
 VILEA1D1	14	71			; archvile
 VILEA2D8	30	69
 VILEA3D7	41	68
@@ -1507,49 +1847,11 @@ VILE]5	44	70
 VILE]6	43	72
 VILE]7	30	74
 VILE]8	32	71
+
 #endif /* #ifdef DOOM2 */
 
-AMMOA0	12	16
-ARM1A0	15	21
-ARM1B0	15	21
-ARM2A0	15	21
-ARM2B0	15	21
-BAL1A0	8	8
-BAL1B0	8	8
-BAL1C0	19	18
-BAL1D0	22	22
-BAL1E0	25	24
-BAL7A1A5	10	8
-BAL7A2A8	18	7
-BAL7A3A7	22	7
-BAL7A4A6	18	6
-BAL7B1B5	10	8
-BAL7B2B8	18	7
-BAL7B3B7	22	7
-BAL7B4B6	18	6
-BAL7C0	20	5
-BAL7D0	23	6
-BAL7E0	23	8
-BAR1A0	10	28
-BAR1B0	10	28
-BEXPA0	23	44
-BEXPB0	34	64
-BEXPC0	40	71
-BEXPD0	33	67
-BEXPE0	27 	64
-BKEYA0	7	19
-BKEYB0	7	19
-BLUDA0	7	5
-BLUDB0	8	7
-BLUDC0	7	7
-BON1A0	7	14
-BON1B0	7	14
-BON1C0	7	14
-BON1D0	7	14
-BON2A0	9	15
-BON2B0	9	15
-BON2C0	9	15
-BON2D0	9	15
+; The following are normal Doom monsters:
+
 BOSSA1	19	69			; baron
 BOSSA2A8	20	68
 BOSSA3A7	26	66
@@ -1609,6 +1911,436 @@ BOSSL0	29	32
 BOSSM0	30	26
 BOSSN0	30	26
 BOSSO0	30	26
+POSSA1	18	50			; former human
+POSSA2A8	17	50
+POSSA3A7	21	50
+POSSA4A6	21	48
+POSSA5	21	47
+POSSB1	19	52
+POSSB2B8	18	51
+POSSB3B7	18	52
+POSSB4B6	20	52
+POSSB5	18	51
+POSSC1	17	50
+POSSC2C8	17	50
+POSSC3C7	18	52
+POSSC4C6	20	51
+POSSC5	17	51
+POSSD1	16	52
+POSSD2D8	18	51
+POSSD3D7	21	52
+POSSD4D6	22	52
+POSSD5	19	51
+POSSE1	12	50
+POSSE2E8	21	50
+POSSE3E7	26	50
+POSSE4E6	18	48
+POSSE5	12	46
+POSSF1	13	50
+POSSF2F8	23	50
+POSSF3F7	27	50
+POSSF4F6	20	48
+POSSF5	11	46
+POSSG1	20	52
+POSSG2G8	16	53
+POSSG3G7	21	53
+POSSG4G6	20	51
+POSSG5	17	49
+POSSH0	19	52
+POSSI0	16	47
+POSSJ0	22	42
+POSSK0	23	29
+POSSL0	22	12
+POSSM0	19	56
+POSSN0	18	59
+POSSO0	25	58
+POSSP0	24	52
+POSSQ0	27	47
+POSSR0	24	39
+POSSS0	24	32
+POSST0	24	22
+POSSU0	24	17
+SARGA1				; demon
+SARGA2A8
+SARGA3A7
+SARGA4A6
+SARGA5
+SARGB1
+SARGB2B8
+SARGB3B7
+SARGB4B6
+SARGB5
+SARGC1
+SARGC2C8
+SARGC3C7
+SARGC4C6
+SARGC5
+SARGD1
+SARGD2D8
+SARGD3D7
+SARGD4D6
+SARGD5
+SARGE1
+SARGE2E8
+SARGE3E7
+SARGE4E6
+SARGE5
+SARGF1
+SARGF2F8
+SARGF3F7
+SARGF4F6
+SARGF5
+SARGG1
+SARGG2G8
+SARGG3G7
+SARGG4G6
+SARGG5
+SARGH0
+SARGI0
+SARGJ0
+SARGK0
+SARGL0
+SARGM0
+SARGN0
+SPOSA1	18	50			; shotgun guy
+SPOSA2A8	13	50
+SPOSA3A7	18	50
+SPOSA4A6	21	48
+SPOSA5	20	47
+SPOSB1	19	52
+SPOSB2B8	12	51
+SPOSB3B7	18	53
+SPOSB4B6	20	52
+SPOSB5	17	51
+SPOSC1	17	50
+SPOSC2C8	10	50
+SPOSC3C7	19	52
+SPOSC4C6	20	51
+SPOSC5	17	51
+SPOSD1	16	52
+SPOSD2D8	11	51
+SPOSD3D7	18	53
+SPOSD4D6	21	52
+SPOSD5	19	52
+SPOSE1	12	50
+SPOSE2E8	17	50
+SPOSE3E7	19	49
+SPOSE4E6	14	48
+SPOSE5	12	46
+SPOSF1	13	50
+SPOSF2F8	21	50
+SPOSF3F7	24	49
+SPOSF4F6	19	48
+SPOSF5	11	46
+SPOSG1	12	52
+SPOSG2G8	13	51
+SPOSG3G7	21	50
+SPOSG4G6	20	50
+SPOSG5	17	49
+SPOSH0	14	57
+SPOSI0	16	51
+SPOSJ0	22	43
+SPOSK0	23	29
+SPOSL0	24	12
+SPOSM0	14	56
+SPOSN0	18	59
+SPOSO0	25	58
+SPOSP0	24	52
+SPOSQ0	27	47
+SPOSR0	24	39
+SPOSS0	24	32
+SPOST0	24	22
+SPOSU0	24	17
+TROOA1	39	58
+TROOA2A8	23	61
+TROOA3A7	28	57
+TROOA4A6	27	52
+TROOA5	22	48
+TROOB1	19	63
+TROOB2B8	22	64
+TROOB3B7	19	61
+TROOB4B6	25	55
+TROOB5	16	52
+TROOC1	20	62
+TROOC2C8	26	62
+TROOC3C7	29	61
+TROOC4C6	22	53
+TROOC5	30	49
+TROOD1	18	60
+TROOD2D8	19	61
+TROOD3D7	22	57
+TROOD4D6	25	56
+TROOD5	14	51
+TROOE1	28	61
+TROOE2E8	22	64
+TROOE3E7	20	64
+TROOE4E6	42	64
+TROOE5	32	66
+TROOF1	26	52
+TROOF2F8	20	56
+TROOF3F7	39	52
+TROOF4F6	44	52
+TROOF5	12	59
+TROOG1	24	56
+TROOG2G8	25	55
+TROOG3G7	24	58
+TROOG4G6	28	57
+TROOG5	47	54
+TROOH1	32	59
+TROOH2H8	24	63
+TROOH3H7	34	63
+TROOH4H6	36	59
+TROOH5	31	53
+TROOI0	32	59
+TROOJ0	29	58
+TROOK0	25	56
+TROOL0	28	44
+TROOM0	32	32
+TROON0	32	59
+TROOO0	29	58
+TROOP0	25	56
+TROOQ0	28	44
+TROOR0	32	32
+TROOS0	32	32
+TROOT0	32	32
+TROOU0	32	32
+
+#ifndef SHAREWARE
+
+; These monsters are not in shareware 
+
+CYBRA1	38	103			; cyberdemon
+CYBRA2	45	103
+CYBRA3	38	104
+CYBRA4	32	106
+CYBRA5	41	106
+CYBRA6	41	105
+CYBRA7	41	105
+CYBRA8	41	105
+CYBRB1	43	106
+CYBRB2	36	105
+CYBRB3	29	105
+CYBRB4	42	107
+CYBRB5	42	107
+CYBRB6	36	107
+CYBRB7	30	106
+CYBRB8	40	107
+CYBRC1	39	105
+CYBRC2	38	105
+CYBRC3	38	104
+CYBRC4	46	106
+CYBRC5	39	106
+CYBRC6	40	106
+CYBRC7	34	107
+CYBRC8	50	107
+CYBRD1	43	106
+CYBRD2	36	106
+CYBRD3	29	106
+CYBRD4	42	107
+CYBRD5	42	107
+CYBRD6	36	107
+CYBRD7	30	107
+CYBRD8	39	107
+CYBRE1	46	105
+CYBRE2	35	105
+CYBRE3	52	105
+CYBRE4	50	104
+CYBRE5	42	105
+CYBRE6	39	105
+CYBRE7	46	105
+CYBRE8	55	105
+CYBRF1	46	105
+CYBRF2	46	105
+CYBRF3	60	105
+CYBRF4	59	104
+CYBRF5	46	105
+CYBRF6	47	105
+CYBRF7	54	105
+CYBRF8	63	105
+CYBRG1	61	105
+CYBRG2	46	106
+CYBRG3	43	105
+CYBRG4	58	105
+CYBRG5	54	104
+CYBRG6	46	105
+CYBRG7	47	105
+CYBRG8	48	104
+CYBRH0	60	106
+CYBRI0	55	108
+CYBRJ0	49	111
+CYBRK0	56	112
+CYBRL0	62	119
+CYBRM0	67	126
+CYBRN0	70	129
+CYBRO0	69	129
+CYBRP0	60	25
+HEADA1	30	59			; cacodemon
+HEADA2A8	27	62
+HEADA3A7	23	56
+HEADA4A6	28	58
+HEADA5	28	58
+HEADB1	30	60
+HEADB2B8	28	65
+HEADB3B7	22	48
+HEADB4B6	28	49
+HEADB5	28	48
+HEADC1	30	61
+HEADC2C8	27	69
+HEADC3C7	26	54
+HEADC4C6	28	53
+HEADC5	28	64
+HEADD1	59	63
+HEADD2D8	29	63
+HEADD3D7	58	62
+HEADD4D6	28	58
+HEADD5	28	64
+HEADE1	30	54
+HEADE2E8	27	52
+HEADE3E7	23	56
+HEADE4E6	28	53
+HEADE5	28	56
+HEADF1	30	49
+HEADF2F8	28	47
+HEADF3F7	22	48
+HEADF4F6	28	49
+HEADF5	28	48
+HEADG0	30	49
+HEADH0	30	49
+HEADI0	30	49
+HEADJ0	30	49
+HEADK0	30	49
+HEADL0	28	37
+SKULA1  22      44				; lost soul
+SKULA8A2        18      39
+SKULA7A3        19      43
+SKULA6A4        17      43
+SKULA5  20      43
+SKULB1  20      42
+SKULB8B2        18      39
+SKULB7B3        19      43
+SKULB6B4        16      42
+SKULB5  20      43
+SKULC1  22      44
+SKULC8C2        18      39
+SKULC7C3        19      43
+SKULC6C4        16      42
+SKULC5  20      43
+SKULD1  22      44      
+SKULD8D2        18      39
+SKULD7D3        19      43
+SKULD6D4        16      42
+SKULD5  20      43
+SKULE1	14	53
+SKULE5	16	49
+SKULE6E4	11	53
+SKULE7E3	15	54
+SKULE8E2	15	54
+SKULF0	17	53
+SKULG0	15	53
+SKULH0	24	48
+SKULI0	35	58
+SKULJ0	45	75
+SKULK0	49	85
+SPIDA1D1	107	105			; spider mastermind
+SPIDA2A8	110	107
+SPIDA3A7	99	106
+SPIDA4A6	111	111
+SPIDA5D5	109	102
+SPIDB1E1	130	104
+SPIDB2B8	130	106
+SPIDB3B7	101	99
+SPIDB4B6	110	99
+SPIDB5E5	111	100
+SPIDC1F1	108	103
+SPIDC2C8	129	107
+SPIDC3C7	103	105
+SPIDC4C6	114	110
+SPIDC5F5	107	101
+SPIDD2D8	113	107
+SPIDD3D7	99	103
+SPIDD4D6	107	106
+SPIDE2E8	113	94
+SPIDE3E7	122	101
+SPIDE4E6	128	106
+SPIDF2F8	114	109
+SPIDF3F7	122	102
+SPIDF4F6	114	106
+SPIDG1	95	101
+SPIDG2G8	123	107
+SPIDG3G7	113	108
+SPIDG4G6	120	112
+SPIDG5	106	105
+SPIDH1	95	101
+SPIDH2H8	123	108
+SPIDH3H7	113	108
+SPIDH4H6	120	112
+SPIDH5	106	105
+SPIDI1	102	102
+SPIDI2	112	105
+SPIDI3	122	100
+SPIDI4	116	106
+SPIDI5	95	100
+SPIDI6	106	107
+SPIDI7	88	102
+SPIDI8	115	105
+SPIDJ0	79	99
+SPIDK0	95	92
+SPIDL0	94	84
+SPIDM0	94	73
+SPIDN0	98	69
+SPIDO0	101	65
+SPIDP0	104	82
+SPIDQ0	109	87
+SPIDR0	110	108
+SPIDS0	98	31
+
+#endif        /* #ifndef SHAREWARE */
+
+#endif        /* #ifdef FREEDM */
+
+; These are normal items that appear in both Freedoom and FreeDM.
+
+AMMOA0	12	16
+ARM1A0	15	21
+ARM1B0	15	21
+ARM2A0	15	21
+ARM2B0	15	21
+BAL1A0	8	8
+BAL1B0	8	8
+BAL1C0	19	18
+BAL1D0	22	22
+BAL1E0	25	24
+BAL7A1A5	10	8
+BAL7A2A8	18	7
+BAL7A3A7	22	7
+BAL7A4A6	18	6
+BAL7B1B5	10	8
+BAL7B2B8	18	7
+BAL7B3B7	22	7
+BAL7B4B6	18	6
+BAL7C0	20	5
+BAL7D0	23	6
+BAL7E0	23	8
+BAR1A0	10	28
+BAR1B0	10	28
+BEXPA0	23	44
+BEXPB0	34	64
+BEXPC0	40	71
+BEXPD0	33	67
+BEXPE0	27 	64
+BKEYA0	7	19
+BKEYB0	7	19
+BLUDA0	7	5
+BLUDB0	8	7
+BLUDC0	7	7
+BON1A0	7	14
+BON1B0	7	14
+BON1C0	7	14
+BON1D0	7	14
+BON2A0	9	15
+BON2B0	9	15
+BON2C0	9	15
+BON2D0	9	15
 BPAKA0	8	26
 BROKA0	27	20
 CANDA0	11	15
@@ -1716,55 +2448,6 @@ PMAPB0	14	28
 PMAPC0	14	28
 PMAPD0	14	28
 POL5A0	27	5
-POSSA1	18	50			; former human
-POSSA2A8	17	50
-POSSA3A7	21	50
-POSSA4A6	21	48
-POSSA5	21	47
-POSSB1	19	52
-POSSB2B8	18	51
-POSSB3B7	18	52
-POSSB4B6	20	52
-POSSB5	18	51
-POSSC1	17	50
-POSSC2C8	17	50
-POSSC3C7	18	52
-POSSC4C6	20	51
-POSSC5	17	51
-POSSD1	16	52
-POSSD2D8	18	51
-POSSD3D7	21	52
-POSSD4D6	22	52
-POSSD5	19	51
-POSSE1	12	50
-POSSE2E8	21	50
-POSSE3E7	26	50
-POSSE4E6	18	48
-POSSE5	12	46
-POSSF1	13	50
-POSSF2F8	23	50
-POSSF3F7	27	50
-POSSF4F6	20	48
-POSSF5	11	46
-POSSG1	20	52
-POSSG2G8	16	53
-POSSG3G7	21	53
-POSSG4G6	20	51
-POSSG5	17	49
-POSSH0	19	52
-POSSI0	16	47
-POSSJ0	22	42
-POSSK0	23	29
-POSSL0	22	12
-POSSM0	19	56
-POSSN0	18	59
-POSSO0	25	58
-POSSP0	24	52
-POSSQ0	27	47
-POSSR0	24	39
-POSSS0	24	32
-POSST0	24	22
-POSSU0	24	17
 PUFFA0	2	3
 PUFFB0	4	4
 PUFFC0	6	5
@@ -1795,97 +2478,6 @@ SOULA0	14	39
 SOULB0	14	39
 SOULC0	14	39
 SOULD0	14	39
-SARGA1				; demon
-SARGA2A8
-SARGA3A7
-SARGA4A6
-SARGA5
-SARGB1
-SARGB2B8
-SARGB3B7
-SARGB4B6
-SARGB5
-SARGC1
-SARGC2C8
-SARGC3C7
-SARGC4C6
-SARGC5
-SARGD1
-SARGD2D8
-SARGD3D7
-SARGD4D6
-SARGD5
-SARGE1
-SARGE2E8
-SARGE3E7
-SARGE4E6
-SARGE5
-SARGF1
-SARGF2F8
-SARGF3F7
-SARGF4F6
-SARGF5
-SARGG1
-SARGG2G8
-SARGG3G7
-SARGG4G6
-SARGG5
-SARGH0
-SARGI0
-SARGJ0
-SARGK0
-SARGL0
-SARGM0
-SARGN0
-SPOSA1	18	50			; shotgun guy
-SPOSA2A8	13	50
-SPOSA3A7	18	50
-SPOSA4A6	21	48
-SPOSA5	20	47
-SPOSB1	19	52
-SPOSB2B8	12	51
-SPOSB3B7	18	53
-SPOSB4B6	20	52
-SPOSB5	17	51
-SPOSC1	17	50
-SPOSC2C8	10	50
-SPOSC3C7	19	52
-SPOSC4C6	20	51
-SPOSC5	17	51
-SPOSD1	16	52
-SPOSD2D8	11	51
-SPOSD3D7	18	53
-SPOSD4D6	21	52
-SPOSD5	19	52
-SPOSE1	12	50
-SPOSE2E8	17	50
-SPOSE3E7	19	49
-SPOSE4E6	14	48
-SPOSE5	12	46
-SPOSF1	13	50
-SPOSF2F8	21	50
-SPOSF3F7	24	49
-SPOSF4F6	19	48
-SPOSF5	11	46
-SPOSG1	12	52
-SPOSG2G8	13	51
-SPOSG3G7	21	50
-SPOSG4G6	20	50
-SPOSG5	17	49
-SPOSH0	14	57
-SPOSI0	16	51
-SPOSJ0	22	43
-SPOSK0	23	29
-SPOSL0	24	12
-SPOSM0	14	56
-SPOSN0	18	59
-SPOSO0	25	58
-SPOSP0	24	52
-SPOSQ0	27	47
-SPOSR0	24	39
-SPOSS0	24	32
-SPOST0	24	22
-SPOSU0	24	17
 STIMA0	7	15
 SUITA0	17	61
 TFOGA0 25 59
@@ -1902,61 +2494,6 @@ TREDA0	14	93
 TREDB0	14	93
 TREDC0	14	93
 TREDD0	14	93
-TROOA1	39	58
-TROOA2A8	23	61
-TROOA3A7	28	57
-TROOA4A6	27	52
-TROOA5	22	48
-TROOB1	19	63
-TROOB2B8	22	64
-TROOB3B7	19	61
-TROOB4B6	25	55
-TROOB5	16	52
-TROOC1	20	62
-TROOC2C8	26	62
-TROOC3C7	29	61
-TROOC4C6	22	53
-TROOC5	30	49
-TROOD1	18	60
-TROOD2D8	19	61
-TROOD3D7	22	57
-TROOD4D6	25	56
-TROOD5	14	51
-TROOE1	28	61
-TROOE2E8	22	64
-TROOE3E7	20	64
-TROOE4E6	42	64
-TROOE5	32	66
-TROOF1	26	52
-TROOF2F8	20	56
-TROOF3F7	39	52
-TROOF4F6	44	52
-TROOF5	12	59
-TROOG1	24	56
-TROOG2G8	25	55
-TROOG3G7	24	58
-TROOG4G6	28	57
-TROOG5	47	54
-TROOH1	32	59
-TROOH2H8	24	63
-TROOH3H7	34	63
-TROOH4H6	36	59
-TROOH5	31	53
-TROOI0	32	59
-TROOJ0	29	58
-TROOK0	25	56
-TROOL0	28	44
-TROOM0	32	32
-
-; these temporarily point at the "normal" death sprites
-TROON0	32	59
-TROOO0	29	58
-TROOP0	25	56
-TROOQ0	28	44
-TROOR0	32	32
-TROOS0	32	32
-TROOT0	32	32
-TROOU0	32	32
 
 YKEYA0	8	19
 YKEYB0	8	19
@@ -1967,7 +2504,51 @@ SMITA0	22	62
 TRE1A0	25	65
 TRE2A0	76	120
 
+#ifdef DOOM2
+
+; These items only appear in Doom 2
+
+HDB1A0	10	83
+HDB2A0	10	83
+HDB3A0	10	59
+HDB4A0	10	59
+HDB5A0	10	59
+HDB6A0	10	59
+MEGAA0	12	32
+MEGAB0	12	32
+MEGAC0	12	32
+MEGAD0	12	32
+FBXPA0	19	32			; mancubus explosion
+FBXPB0	19	31
+FBXPC0	22	35
+SHT2A0  -186    -89				; super shotgun
+SHT2B0  -199    -80
+SHT2C0  -204    -89
+SHT2D0  -176    -107
+SHT2E0  -180    -89
+SHT2F0  -180    -56
+SHT2G0  -178    -58
+SHT2H0  -141    -110
+SHT2I0  -174    -80
+SHT2J0  -171    -77
+SGN2A0  20      9
+TLMPA0	11	77
+TLMPB0	11	77
+TLMPC0	11	77
+TLMPD0	11	77
+TLP2A0	10	57
+TLP2B0	10	57
+TLP2C0	10	57
+TLP2D0	10	57
+POB1A0
+POB2A0
+
+#endif
+
 #ifndef SHAREWARE 
+
+; These items do not appear in shareware builds
+
 APBXA0	12	11
 APBXB0	19	18
 APBXC0	17	18
@@ -1980,7 +2561,6 @@ BAL2B0	7	7
 BAL2C0	23	24
 BAL2D0	25	21
 BAL2E0	26	23
-
 BFS1A0	28	33
 BFS1B0	29	33
 BFUGA0	41	11
@@ -1998,8 +2578,6 @@ BFE2A0  36      28
 BFE2B0  34      28
 BFE2C0  12      10
 BFE2D0  4       4
-
-
 BSKUA0	7	18
 BSKUB0	7	18
 CELLA0	8	12
@@ -2014,71 +2592,6 @@ COL4A0 18 40
 COL5A0 18 47
 COL5B0 18 47
 COL6A0 18 50
-CYBRA1	38	103			; cyberdemon
-CYBRA2	45	103
-CYBRA3	38	104
-CYBRA4	32	106
-CYBRA5	41	106
-CYBRA6	41	105
-CYBRA7	41	105
-CYBRA8	41	105
-CYBRB1	43	106
-CYBRB2	36	105
-CYBRB3	29	105
-CYBRB4	42	107
-CYBRB5	42	107
-CYBRB6	36	107
-CYBRB7	30	106
-CYBRB8	40	107
-CYBRC1	39	105
-CYBRC2	38	105
-CYBRC3	38	104
-CYBRC4	46	106
-CYBRC5	39	106
-CYBRC6	40	106
-CYBRC7	34	107
-CYBRC8	50	107
-CYBRD1	43	106
-CYBRD2	36	106
-CYBRD3	29	106
-CYBRD4	42	107
-CYBRD5	42	107
-CYBRD6	36	107
-CYBRD7	30	107
-CYBRD8	39	107
-CYBRE1	46	105
-CYBRE2	35	105
-CYBRE3	52	105
-CYBRE4	50	104
-CYBRE5	42	105
-CYBRE6	39	105
-CYBRE7	46	105
-CYBRE8	55	105
-CYBRF1	46	105
-CYBRF2	46	105
-CYBRF3	60	105
-CYBRF4	59	104
-CYBRF5	46	105
-CYBRF6	47	105
-CYBRF7	54	105
-CYBRF8	63	105
-CYBRG1	61	105
-CYBRG2	46	106
-CYBRG3	43	105
-CYBRG4	58	105
-CYBRG5	54	104
-CYBRG6	46	105
-CYBRG7	47	105
-CYBRG8	48	104
-CYBRH0	60	106
-CYBRI0	55	108
-CYBRJ0	49	111
-CYBRK0	56	112
-CYBRL0	62	119
-CYBRM0	67	126
-CYBRN0	70	129
-CYBRO0	69	129
-CYBRP0	60	25
 FCANA0	16	64
 FCANB0	16	64
 FCANC0	16	64
@@ -2092,42 +2605,6 @@ GOR2A0	22	83
 GOR3A0	19	83
 GOR4A0	6	67
 GOR5A0	6	51
-HEADA1	30	59			; cacodemon
-HEADA2A8	27	62
-HEADA3A7	23	56
-HEADA4A6	28	58
-HEADA5	28	58
-HEADB1	30	60
-HEADB2B8	28	65
-HEADB3B7	22	48
-HEADB4B6	28	49
-HEADB5	28	48
-HEADC1	30	61
-HEADC2C8	27	69
-HEADC3C7	26	54
-HEADC4C6	28	53
-HEADC5	28	64
-HEADD1	59	63
-HEADD2D8	29	63
-HEADD3D7	58	62
-HEADD4D6	28	58
-HEADD5	28	64
-HEADE1	30	54
-HEADE2E8	27	52
-HEADE3E7	23	56
-HEADE4E6	28	53
-HEADE5	28	56
-HEADF1	30	49
-HEADF2F8	28	47
-HEADF3F7	22	48
-HEADF4F6	28	49
-HEADF5	28	48
-HEADG0	30	49
-HEADH0	30	49
-HEADI0	30	49
-HEADJ0	30	49
-HEADK0	30	49
-HEADL0	28	37
 PINVA0	11	23
 PINVB0	11	23
 PINVC0	11	23
@@ -2154,37 +2631,6 @@ POL6B0	19	62
 PSTRA0	12	15
 RSKUA0	7	18
 RSKUB0	7	18
-SKULA1  22      44				; lost soul
-SKULA8A2        18      39
-SKULA7A3        19      43
-SKULA6A4        17      43
-SKULA5  20      43
-SKULB1  20      42
-SKULB8B2        18      39
-SKULB7B3        19      43
-SKULB6B4        16      42
-SKULB5  20      43
-SKULC1  22      44
-SKULC8C2        18      39
-SKULC7C3        19      43
-SKULC6C4        16      42
-SKULC5  20      43
-SKULD1  22      44      
-SKULD8D2        18      39
-SKULD7D3        19      43
-SKULD6D4        16      42
-SKULD5  20      43
-SKULE1	14	53
-SKULE5	16	49
-SKULE6E4	11	53
-SKULE7E3	15	54
-SKULE8E2	15	54
-SKULF0	17	53
-SKULG0	15	53
-SKULH0	24	48
-SKULI0	35	58
-SKULJ0	45	75
-SKULK0	49	85
 SMBTA0	10	72
 SMBTB0	10	72
 SMBTC0	10	72
@@ -2198,58 +2644,6 @@ SMRTB0	10	72
 SMRTC0	10	72
 SMRTD0	10	72
 SMT2A0	10	42
-SPIDA1D1	107	105			; spider mastermind
-SPIDA2A8	110	107
-SPIDA3A7	99	106
-SPIDA4A6	111	111
-SPIDA5D5	109	102
-SPIDB1E1	130	104
-SPIDB2B8	130	106
-SPIDB3B7	101	99
-SPIDB4B6	110	99
-SPIDB5E5	111	100
-SPIDC1F1	108	103
-SPIDC2C8	129	107
-SPIDC3C7	103	105
-SPIDC4C6	114	110
-SPIDC5F5	107	101
-SPIDD2D8	113	107
-SPIDD3D7	99	103
-SPIDD4D6	107	106
-SPIDE2E8	113	94
-SPIDE3E7	122	101
-SPIDE4E6	128	106
-SPIDF2F8	114	109
-SPIDF3F7	122	102
-SPIDF4F6	114	106
-SPIDG1	95	101
-SPIDG2G8	123	107
-SPIDG3G7	113	108
-SPIDG4G6	120	112
-SPIDG5	106	105
-SPIDH1	95	101
-SPIDH2H8	123	108
-SPIDH3H7	113	108
-SPIDH4H6	120	112
-SPIDH5	106	105
-SPIDI1	102	102
-SPIDI2	112	105
-SPIDI3	122	100
-SPIDI4	116	106
-SPIDI5	95	100
-SPIDI6	106	107
-SPIDI7	88	102
-SPIDI8	115	105
-SPIDJ0	79	99
-SPIDK0	95	92
-SPIDL0	94	84
-SPIDM0	94	73
-SPIDN0	98	69
-SPIDO0	101	65
-SPIDP0	104	82
-SPIDQ0	109	87
-SPIDR0	110	108
-SPIDS0	98	31
 TBLUA0	14	93
 TBLUB0	14	93
 TBLUC0	14	93
@@ -2260,6 +2654,7 @@ TGRNC0	14	93
 TGRND0	14	93
 YSKUA0	7	18
 YSKUB0	7	18
+
 #endif /* #ifndef SHAREWARE */
 
 [patches]
@@ -2661,6 +3056,16 @@ W104_1
 
 [flats]
 
+#ifdef FREEDM
+
+; These flats are only in the FreeDM wad.
+
+DUMMY1
+DUMMY2
+DUMMY3
+
+#endif
+
 #ifndef SHAREWARE
 
 ; these flats are not in shareware
@@ -2849,3 +3254,4 @@ SLIME16
 GRASS1
 SLIME13
 RROCK03
+
diff --git a/flats/dummy1.gif b/flats/dummy1.gif
new file mode 120000
index 00000000..cbd743ac
--- /dev/null
+++ b/flats/dummy1.gif
@@ -0,0 +1 @@
+rellik/dummy1.gif
\ No newline at end of file
diff --git a/flats/dummy2.gif b/flats/dummy2.gif
new file mode 120000
index 00000000..97948b5c
--- /dev/null
+++ b/flats/dummy2.gif
@@ -0,0 +1 @@
+rellik/dummy2.gif
\ No newline at end of file
diff --git a/flats/dummy3.gif b/flats/dummy3.gif
new file mode 120000
index 00000000..c55dee25
--- /dev/null
+++ b/flats/dummy3.gif
@@ -0,0 +1 @@
+rellik/dummy3.gif
\ No newline at end of file
diff --git a/flats/rellik/dummy1.gif b/flats/rellik/dummy1.gif
new file mode 100644
index 00000000..c20befa4
Binary files /dev/null and b/flats/rellik/dummy1.gif differ
diff --git a/flats/rellik/dummy2.gif b/flats/rellik/dummy2.gif
new file mode 100644
index 00000000..3c5e4040
Binary files /dev/null and b/flats/rellik/dummy2.gif differ
diff --git a/flats/rellik/dummy3.gif b/flats/rellik/dummy3.gif
new file mode 100644
index 00000000..0de4658a
Binary files /dev/null and b/flats/rellik/dummy3.gif differ
diff --git a/levels/dm01.wad b/levels/dm01.wad
new file mode 120000
index 00000000..1dbbd31d
--- /dev/null
+++ b/levels/dm01.wad
@@ -0,0 +1 @@
+rellik/dm01.wad
\ No newline at end of file
diff --git a/levels/dm02.wad b/levels/dm02.wad
new file mode 120000
index 00000000..d34c53ec
--- /dev/null
+++ b/levels/dm02.wad
@@ -0,0 +1 @@
+rellik/dm02.wad
\ No newline at end of file
diff --git a/levels/dm03.wad b/levels/dm03.wad
new file mode 120000
index 00000000..632754ee
--- /dev/null
+++ b/levels/dm03.wad
@@ -0,0 +1 @@
+rellik/dm03.wad
\ No newline at end of file
diff --git a/levels/dm04.wad b/levels/dm04.wad
new file mode 120000
index 00000000..083d0bd3
--- /dev/null
+++ b/levels/dm04.wad
@@ -0,0 +1 @@
+rellik/dm04.wad
\ No newline at end of file
diff --git a/levels/dm05.wad b/levels/dm05.wad
new file mode 120000
index 00000000..1c8f3f3e
--- /dev/null
+++ b/levels/dm05.wad
@@ -0,0 +1 @@
+rellik/dm05.wad
\ No newline at end of file
diff --git a/levels/dm06.wad b/levels/dm06.wad
new file mode 120000
index 00000000..4a8bcec9
--- /dev/null
+++ b/levels/dm06.wad
@@ -0,0 +1 @@
+rellik/dm06.wad
\ No newline at end of file
diff --git a/levels/dm07.wad b/levels/dm07.wad
new file mode 120000
index 00000000..361cb035
--- /dev/null
+++ b/levels/dm07.wad
@@ -0,0 +1 @@
+rellik/dm07.wad
\ No newline at end of file
diff --git a/levels/dm08.wad b/levels/dm08.wad
new file mode 120000
index 00000000..1bb7d4d4
--- /dev/null
+++ b/levels/dm08.wad
@@ -0,0 +1 @@
+rellik/dm08.wad
\ No newline at end of file
diff --git a/levels/dm09.wad b/levels/dm09.wad
new file mode 120000
index 00000000..123ccbff
--- /dev/null
+++ b/levels/dm09.wad
@@ -0,0 +1 @@
+rellik/dm09.wad
\ No newline at end of file
diff --git a/levels/dm10.wad b/levels/dm10.wad
new file mode 120000
index 00000000..d5e5e8ed
--- /dev/null
+++ b/levels/dm10.wad
@@ -0,0 +1 @@
+rellik/dm10.wad
\ No newline at end of file
diff --git a/levels/dm11.wad b/levels/dm11.wad
new file mode 120000
index 00000000..fc1b46e7
--- /dev/null
+++ b/levels/dm11.wad
@@ -0,0 +1 @@
+rellik/dm11.wad
\ No newline at end of file
diff --git a/levels/dm12.wad b/levels/dm12.wad
new file mode 120000
index 00000000..2be00ccb
--- /dev/null
+++ b/levels/dm12.wad
@@ -0,0 +1 @@
+rellik/dm12.wad
\ No newline at end of file
diff --git a/levels/dm13.wad b/levels/dm13.wad
new file mode 120000
index 00000000..7917ba40
--- /dev/null
+++ b/levels/dm13.wad
@@ -0,0 +1 @@
+rellik/dm13.wad
\ No newline at end of file
diff --git a/levels/dm14.wad b/levels/dm14.wad
new file mode 120000
index 00000000..aa45c9e9
--- /dev/null
+++ b/levels/dm14.wad
@@ -0,0 +1 @@
+rellik/dm14.wad
\ No newline at end of file
diff --git a/levels/dm15.wad b/levels/dm15.wad
new file mode 120000
index 00000000..216776dd
--- /dev/null
+++ b/levels/dm15.wad
@@ -0,0 +1 @@
+rellik/dm15.wad
\ No newline at end of file
diff --git a/levels/rellik/dm01.wad b/levels/rellik/dm01.wad
new file mode 100644
index 00000000..9af84d6c
Binary files /dev/null and b/levels/rellik/dm01.wad differ
diff --git a/levels/rellik/dm02.wad b/levels/rellik/dm02.wad
new file mode 100644
index 00000000..fec06289
Binary files /dev/null and b/levels/rellik/dm02.wad differ
diff --git a/levels/rellik/dm03.wad b/levels/rellik/dm03.wad
new file mode 100644
index 00000000..25000224
Binary files /dev/null and b/levels/rellik/dm03.wad differ
diff --git a/levels/rellik/dm04.wad b/levels/rellik/dm04.wad
new file mode 100644
index 00000000..270c00f1
Binary files /dev/null and b/levels/rellik/dm04.wad differ
diff --git a/levels/rellik/dm05.wad b/levels/rellik/dm05.wad
new file mode 100644
index 00000000..d33e4fa0
Binary files /dev/null and b/levels/rellik/dm05.wad differ
diff --git a/levels/rellik/dm06.wad b/levels/rellik/dm06.wad
new file mode 100644
index 00000000..c30183bf
Binary files /dev/null and b/levels/rellik/dm06.wad differ
diff --git a/levels/rellik/dm07.wad b/levels/rellik/dm07.wad
new file mode 100644
index 00000000..64dcee8a
Binary files /dev/null and b/levels/rellik/dm07.wad differ
diff --git a/levels/rellik/dm08.wad b/levels/rellik/dm08.wad
new file mode 100644
index 00000000..38bf4624
Binary files /dev/null and b/levels/rellik/dm08.wad differ
diff --git a/levels/rellik/dm09.wad b/levels/rellik/dm09.wad
new file mode 100644
index 00000000..90ec9f1c
Binary files /dev/null and b/levels/rellik/dm09.wad differ
diff --git a/levels/rellik/dm10.wad b/levels/rellik/dm10.wad
new file mode 100644
index 00000000..85ffca5f
Binary files /dev/null and b/levels/rellik/dm10.wad differ
diff --git a/levels/rellik/dm11.wad b/levels/rellik/dm11.wad
new file mode 100644
index 00000000..cdc8fb54
Binary files /dev/null and b/levels/rellik/dm11.wad differ
diff --git a/levels/rellik/dm12.wad b/levels/rellik/dm12.wad
new file mode 100644
index 00000000..26df8404
Binary files /dev/null and b/levels/rellik/dm12.wad differ
diff --git a/levels/rellik/dm13.wad b/levels/rellik/dm13.wad
new file mode 100644
index 00000000..2c1d6fc8
Binary files /dev/null and b/levels/rellik/dm13.wad differ
diff --git a/levels/rellik/dm14.wad b/levels/rellik/dm14.wad
new file mode 100644
index 00000000..b3378f5a
Binary files /dev/null and b/levels/rellik/dm14.wad differ
diff --git a/levels/rellik/dm15.wad b/levels/rellik/dm15.wad
new file mode 100644
index 00000000..aec29ead
Binary files /dev/null and b/levels/rellik/dm15.wad differ
diff --git a/patches/logo.gif b/patches/logo.gif
new file mode 120000
index 00000000..a94736e2
--- /dev/null
+++ b/patches/logo.gif
@@ -0,0 +1 @@
+rellik/logo.gif
\ No newline at end of file
diff --git a/patches/logo3.gif b/patches/logo3.gif
new file mode 120000
index 00000000..22de39fb
--- /dev/null
+++ b/patches/logo3.gif
@@ -0,0 +1 @@
+rellik/logo3.gif
\ No newline at end of file
diff --git a/patches/logo4.gif b/patches/logo4.gif
new file mode 120000
index 00000000..cf33b61c
--- /dev/null
+++ b/patches/logo4.gif
@@ -0,0 +1 @@
+rellik/logo4.gif
\ No newline at end of file
diff --git a/patches/logo5.gif b/patches/logo5.gif
new file mode 120000
index 00000000..9446ca0e
--- /dev/null
+++ b/patches/logo5.gif
@@ -0,0 +1 @@
+rellik/logo5.gif
\ No newline at end of file
diff --git a/patches/rellik/logo.gif b/patches/rellik/logo.gif
new file mode 100644
index 00000000..eae149c7
Binary files /dev/null and b/patches/rellik/logo.gif differ
diff --git a/patches/rellik/logo3.gif b/patches/rellik/logo3.gif
new file mode 100644
index 00000000..b309905b
Binary files /dev/null and b/patches/rellik/logo3.gif differ
diff --git a/patches/rellik/logo4.gif b/patches/rellik/logo4.gif
new file mode 100644
index 00000000..079810b2
Binary files /dev/null and b/patches/rellik/logo4.gif differ
diff --git a/patches/rellik/logo5.gif b/patches/rellik/logo5.gif
new file mode 100644
index 00000000..1a29ee18
Binary files /dev/null and b/patches/rellik/logo5.gif differ
diff --git a/sprites/dummy-blank.gif b/sprites/blank.gif
similarity index 100%
rename from sprites/dummy-blank.gif
rename to sprites/blank.gif
diff --git a/textures/combined.txt b/textures/combined.txt
index 7ecf05d7..61e56e2b 100644
--- a/textures/combined.txt
+++ b/textures/combined.txt
@@ -23,6 +23,11 @@
 ;
 ; 10/3/2003: modified build to use a single file with #defines
 
+#ifdef FREEDM
+#define DOOM1
+#define DOOM2
+#endif
+
 #ifdef DOOM2
 #undef SHAREWARE
 #undef ULTDOOM
@@ -1067,6 +1072,22 @@ WFALL4			64	128
 
 #endif
 
+; These textures are only in FreeDM
+
+#ifdef FREEDM
+
+LOGO                    256     128
+*       LOGO            0       0
+LOGO4                   256     128
+*       LOGO4           0       0
+LOGO3                   256     128
+*       LOGO3           0       0
+LOGO5                   64      128
+*       LOGO5           0       0
+
+#endif
+
+
 ; common textures
 
 ASHWALL2    		64	128
@@ -1804,5 +1825,4 @@ MIDBARS3    		64	72
 *	RW45_1      	0	0
 MARBFAC3    		128	128
 *	MWALL5_1    	0	0
-;End
 
diff --git a/wadinfo-builder.pl b/wadinfo-builder.pl
index b056888f..ff96ca5b 100755
--- a/wadinfo-builder.pl
+++ b/wadinfo-builder.pl
@@ -72,47 +72,61 @@ while (<STDIN>) {
 
 	# check for empty lines and comments
 
-	if(!/^[\#\;]/ && !/^\s*$/) {
+	# sections
 
-		# sections
+	if(/\[.*\]/) {
 
-		if(/\[.*\]/) {
+		# extract section name
 
-			# extract section name
+		$section = $_;
+		$section =~ s/.*\[//;
+		$section =~ s/\].*//;
 
-			$section = $_;
-			$section =~ s/.*\[//;
-			$section =~ s/\].*//;
+		# catch [texture1] and [texture2] which are in 
+		# textures/
 
-			# catch [texture1] and [texture2] which are in 
-			# textures/
+		$section = "textures"
+	 		if $section eq "texture1" ||
+			   $section eq "texture2";
 
-			$section = "textures"
-		 		if $section eq "texture1" ||
-				   $section eq "texture2";
+	} elsif (/^\s*(\S+)(\s*\=\s*(\S+))?/) {
+		
+        my ($resname, $override) = ($1, $3);
+           
+        $resname = lc($resname);
 
+        # allow "=foo" to override the filename used
+
+		my $filename;
+
+        if ($override) {
+            $filename = findfile($section, $override);
+        } else {
+            $filename = findfile($section, $resname);
+        }
+
+		if ($filename) {
+			if (!$forced_lump{$resname} && !recent($filename)) {
+				$_ = ";$_";
+			}
 		} else {
-			
-			my ($word) = split(' ', $_);
-			$word = lc($word);
-			my $filename = findfile($section, $word);
+			if ($forced_lump{$resname} || $dummy) {
 
-			if ($filename) {
-				if (!$forced_lump{$word} && !recent($filename)) {
-					$_ = ";$_";
+                # this hasnt been submitted yet - use a dummy lump
+                # instead
+
+				if ($resname =~ /^DEMO/i) {
+					$_ = "$resname = fakedemo";
+				} else {
+					$_ = "$resname = dummy";
 				}
 			} else {
-				if ($forced_lump{$word} || $dummy) {
-					if ($word =~ /^DEMO/i) {
-						$_ = "$_ = fakedemo";
-					} else {
-						$_ = "$_ = dummy";
-					}
-				} else {
-					$_ = ";$_";
-				}
+                # disabled entries are commented out
+
+				$_ = ";$_";
 			}
 		}
 	}
+
 	print $_ . "\n";
 }