diff --git a/Makefile b/Makefile
index 5f3d90e4..79eb9077 100644
--- a/Makefile
+++ b/Makefile
@@ -135,13 +135,15 @@ waddir?=/share/games/doom
 target=$(DESTDIR)$(prefix)
 
 %.6:
-	sed -e s/freedoom/$*/ dist/freedoom.adoc > dist/$*.adoc
-	a2x -f manpage dist/$*.adoc
+	$(MAKE) -C dist man-$*
+
+%.png:
+	$(MAKE) -C dist icon-$*
 
 # This is bad because it assumes the IWADs will always be defined like
 # this.  I just can't see another way to do it.  Fix later if possible.
 
-install-%: $(WADS)/%.wad %.6
+install-%: $(WADS)/%.wad %.6 %.png
 	install -d "$(target)$(bindir)"
 	install -m 755 dist/freedoom "$(target)$(bindir)/$*"
 	install -d "$(target)$(mandir)/man6"
@@ -153,7 +155,7 @@ install-%: $(WADS)/%.wad %.6
 	install -d "$(target)/share/appdata"
 	install -m 644 dist/$*.appdata.xml "$(target)/share/appdata"
 	install -d "$(target)/share/icons"
-	install -m 644 dist/freedoom.png "$(target)/share/icons/$*.png"
+	install -m 644 dist/$*.png "$(target)/share/icons/$*.png"
 
 uninstall-%:
 	rm "$(target)$(bindir)/$*"
diff --git a/dist/.gitignore b/dist/.gitignore
index 40340965..82eb2ec4 100644
--- a/dist/.gitignore
+++ b/dist/.gitignore
@@ -1,3 +1,4 @@
 *.6
+*.png
 freedm.adoc
 freedoom[12].adoc
diff --git a/dist/Makefile b/dist/Makefile
new file mode 100644
index 00000000..dbbfbfe1
--- /dev/null
+++ b/dist/Makefile
@@ -0,0 +1,18 @@
+man-%: freedoom.adoc
+	sed -e s/freedoom/$*/ freedoom.adoc > $*.adoc
+	a2x -f manpage $*.adoc
+
+icon-freedm:
+	convert -trim +repage -extent 32x32 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../graphics/stfkill3.gif freedm.png
+
+icon-freedoom1:
+	convert -trim +repage -extent 48x48 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../sprites/playa2a8.gif freedoom1.png
+
+icon-freedoom2:
+	convert -trim +repage -extent 64x64 -gravity center \
+	    -transparent \#00ffff -background \#00ffff \
+	    ../sprites/heada1.gif freedoom2.png
diff --git a/dist/freedoom.png b/dist/freedoom.png
deleted file mode 100644
index 492b3f36..00000000
Binary files a/dist/freedoom.png and /dev/null differ