diff --git a/Makefile b/Makefile
index feb559130..957b920dd 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,6 @@ release: releasedir
 	@cd build ; \
 	    tar -czvf tuxpaint-$(VER_VERSION).tar.gz tuxpaint-$(VER_VERSION)
 
-
 # "make nosound" builds the program with sound disabled:
 .PHONY: nosound
 nosound:
diff --git a/docs/Makefile b/docs/Makefile
index d58541078..3356ff536 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -14,30 +14,15 @@
 LINKS_OPTIONS:=-dump
 LINKS:=links $(LINKS_OPTIONS)
 
+HTMLFILES:=$(wildcard html/*.html)
+TEXTFILES:=$(patsubst html/%.html,%.txt,$(HTMLFILES))
+
 .PHONY: all
-all:	README.txt OPTIONS.txt FAQ.txt EXTENDING.txt ADVANCED-STAMPS-HOWTO.txt
+all:	$(TEXTFILES)
 
 .PHONY: clean
 clean:
-	-rm README.txt
-	-rm OPTIONS.txt
-	-rm FAQ.txt
-	-rm EXTENDING.txt
-	-rm ADVANCED-STAMPS-HOWTO.txt
+	-rm $(TEXTFILES)
 
-README.txt:	html/README.html
+$(TEXTFILES): %.txt: html/%.html  
 	$(LINKS) $< > $@
-
-OPTIONS.txt:	html/OPTIONS.html
-	$(LINKS) $< > $@
-
-FAQ.txt:	html/FAQ.html
-	$(LINKS) $< > $@
-
-EXTENDING.txt:	html/EXTENDING.html
-	$(LINKS) $< > $@
-
-ADVANCED-STAMPS-HOWTO.txt:	html/ADVANCED-STAMPS-HOWTO.html
-	$(LINKS) $< > $@
-
-
diff --git a/docs/fr/Makefile b/docs/fr/Makefile
index d6af60f44..962c7c049 100644
--- a/docs/fr/Makefile
+++ b/docs/fr/Makefile
@@ -1,39 +1,2 @@
-# Makefile for Tux Paint docs
-# 
-# Uses "links" to convert docs from HTML to plain text.
-# (Normally only ran by the developers after updating the HTML, prior to
-# release.)
-#
-# Bill Kendrick
-# bill@newbreedsoftware.com
-# 
-# Sept. 4, 2005 - October 24, 2005
-
-LINKS:=links -dump -no-numbering -no-references
-
-.PHONY: all
-all:	README1.txt README2.txt OPTIONS.txt FAQ.txt PNG.txt
-
-.PHONY: clean
-clean:
-	-rm README1.txt
-	-rm README2.txt
-	-rm OPTIONS.txt
-	-rm FAQ.txt
-	-rm PNG.txt
-
-README1.txt:	html/README1.html
-	$(LINKS) $< > $@
-
-README2.txt:	html/README2.html
-	$(LINKS) $< > $@
-
-OPTIONS.txt:	html/OPTIONS.html
-	$(LINKS) $< > $@
-
-FAQ.txt:	html/FAQ.html
-	$(LINKS) $< > $@
-
-PNG.txt:	html/PNG.html
-	$(LINKS) $< > $@
+include ../Makefile
 
diff --git a/docs/ru/Makefile b/docs/ru/Makefile
index 0bedc4540..962c7c049 100644
--- a/docs/ru/Makefile
+++ b/docs/ru/Makefile
@@ -1,42 +1,2 @@
-# Makefile for Tux Paint docs
-# 
-# Uses "links" to convert docs from HTML to plain text.
-# (Normally only ran by the developers after updating the HTML, prior to
-# release.)
-#
-# Bill Kendrick
-# bill@newbreedsoftware.com
-# 
-# Sept. 4, 2005 - March 8, 2006
-# $Id$
-
-LINKS:=links -dump -no-numbering -no-references
-
-.PHONY: all
-all:	README.txt OPTIONS.txt EXTENDING.txt FAQ.txt
-# ADVANCED-STAMPS-HOWTO.txt
-
-.PHONY: clean
-clean:
-	-rm README.txt
-	-rm OPTIONS.txt
-	-rm FAQ.txt
-	-rm EXTENDING.txt
-#	-rm ADVANCED-STAMPS-HOWTO.txt
-
-README.txt:	html/README.html
-	$(LINKS) $< > $@
-
-OPTIONS.txt:	html/OPTIONS.html
-	$(LINKS) $< > $@
-
-FAQ.txt:	html/FAQ.html
-	$(LINKS) $< > $@
-
-EXTENDING.txt:	html/EXTENDING.html
-	$(LINKS) $< > $@
-
-ADVANCED-STAMPS-HOWTO.txt:	html/ADVANCED-STAMPS-HOWTO.html
-	$(LINKS) $< > $@
-
+include ../Makefile
 
diff --git a/docs/zh_cn/Makefile b/docs/zh_cn/Makefile
index e465f57a6..962c7c049 100644
--- a/docs/zh_cn/Makefile
+++ b/docs/zh_cn/Makefile
@@ -1,43 +1,2 @@
-# Makefile for Tux Paint docs
-# 
-# Uses "links" to convert docs from HTML to plain text.
-# (Normally only ran by the developers after updating the HTML, prior to
-# release.)
-#
-# Bill Kendrick
-# bill@newbreedsoftware.com
-# 
-# $Id$
-
-LINKS:=links -dump -no-numbering -no-references
-
-.PHONY: all
-all:	README.txt FAQ.txt
-# OPTIONS.txt
-# EXTENDING.txt
-# ADVANCED-STAMPS-HOWTO.txt
-
-.PHONY: clean
-clean:
-	-rm README.txt
-	-rm FAQ.txt
-#	-rm OPTIONS.txt
-#	-rm EXTENDING.txt
-#	-rm ADVANCED-STAMPS-HOWTO.txt
-
-README.txt:	html/README.html
-	$(LINKS) $< > $@
-
-OPTIONS.txt:	html/OPTIONS.html
-	$(LINKS) $< > $@
-
-FAQ.txt:	html/FAQ.html
-	$(LINKS) $< > $@
-
-EXTENDING.txt:	html/EXTENDING.html
-	$(LINKS) $< > $@
-
-ADVANCED-STAMPS-HOWTO.txt:	html/ADVANCED-STAMPS-HOWTO.html
-	$(LINKS) $< > $@
-
+include ../Makefile
 
diff --git a/docs/zh_tw/Makefile b/docs/zh_tw/Makefile
index 73189f35a..962c7c049 100644
--- a/docs/zh_tw/Makefile
+++ b/docs/zh_tw/Makefile
@@ -1,43 +1,2 @@
-# Makefile for Tux Paint docs
-# 
-# Uses "links" to convert docs from HTML to plain text.
-# (Normally only ran by the developers after updating the HTML, prior to
-# release.)
-#
-# Bill Kendrick
-# bill@newbreedsoftware.com
-# 
-# $Id$
-
-LINKS:=links -dump -no-numbering -no-references
-
-.PHONY: all
-all:	README.txt \
-	OPTIONS.txt
-	# FAQ.txt \
-	# EXTENDING.txt \
-	# ADVANCED-STAMPS-HOWTO.txt
-
-.PHONY: clean
-clean:
-	-rm README.txt
-	-rm OPTIONS.txt
-	#-rm FAQ.txt
-	#-rm EXTENDING.txt
-	#-rm ADVANCED-STAMPS-HOWTO.txt
-
-README.txt:	html/README.html
-	$(LINKS) $< > $@
-
-OPTIONS.txt:	html/OPTIONS.html
-	$(LINKS) $< > $@
-
-FAQ.txt:	html/FAQ.html
-	$(LINKS) $< > $@
-
-EXTENDING.txt:	html/EXTENDING.html
-	$(LINKS) $< > $@
-
-ADVANCED-STAMPS-HOWTO.txt:	html/ADVANCED-STAMPS-HOWTO.html
-	$(LINKS) $< > $@
+include ../Makefile
 
diff --git a/magic/magic-docs/Makefile b/magic/magic-docs/Makefile
index 874ccc916..5977c3ee8 100644
--- a/magic/magic-docs/Makefile
+++ b/magic/magic-docs/Makefile
@@ -1,130 +1 @@
-# Makefile for Tux Paint Magic Tool Plugin API docs
-# 
-# Uses "links" to convert docs from HTML to plain text.
-# (Normally only ran by the developers after updating the HTML, prior to
-# release.)
-#
-# Bill Kendrick
-# bill@newbreedsoftware.com
-# 
-# August 2, 2007 - August 9, 2007
-# $Id$
-
-LINKS:=links -dump -no-numbering -no-references
-
-TXT_FILES:= \
-	blocks.txt \
-	blur.txt \
-	bricks.txt \
-	calligraphy.txt \
-	cartoon.txt \
-	chalk.txt \
-	darken.txt \
-	drip.txt \
-	emboss.txt \
-	fade.txt \
-	fill.txt \
-	flip.txt \
-	flower.txt \
-	foam.txt \
-	glasstile.txt \
-	grass.txt \
-	kalidescope.txt \
-	light.txt \
-	metalpaint.txt \
-	mirror.txt \
-	negative.txt \
-	rainbow.txt \
-	ripples.txt \
-	shift.txt \
-	smudge.txt \
-	tint.txt \
-	waves.txt
-
-.PHONY: all
-all:	$(TXT_FILES)
-
-.PHONY: clean
-clean:
-	@-rm $(TXT_FILES)
-
-blocks.txt: html/blocks.html
-	@$(LINKS) $< > $@
-
-blur.txt: html/blur.html
-	@$(LINKS) $< > $@
-
-bricks.txt: html/bricks.html
-	@$(LINKS) $< > $@
-
-calligraphy.txt: html/calligraphy.html
-	@$(LINKS) $< > $@
-
-cartoon.txt: html/cartoon.html
-	@$(LINKS) $< > $@
-
-chalk.txt: html/chalk.html
-	@$(LINKS) $< > $@
-
-darken.txt: html/darken.html
-	@$(LINKS) $< > $@
-
-drip.txt: html/drip.html
-	@$(LINKS) $< > $@
-
-emboss.txt: html/emboss.html
-	@$(LINKS) $< > $@
-
-fade.txt: html/fade.html
-	@$(LINKS) $< > $@
-
-fill.txt: html/fill.html
-	@$(LINKS) $< > $@
-
-flip.txt: html/flip.html
-	@$(LINKS) $< > $@
-
-flower.txt: html/flower.html
-	@$(LINKS) $< > $@
-
-foam.txt: html/foam.html
-	@$(LINKS) $< > $@
-
-glasstile.txt: html/glasstile.html
-	@$(LINKS) $< > $@
-
-grass.txt: html/grass.html
-	@$(LINKS) $< > $@
-
-kalidescope.txt: html/kalidescope.html
-	@$(LINKS) $< > $@
-
-metalpaint.txt: html/metalpaint.html
-	@$(LINKS) $< > $@
-
-mirror.txt: html/mirror.html
-	@$(LINKS) $< > $@
-
-negative.txt: html/negative.html
-	@$(LINKS) $< > $@
-
-rainbow.txt: html/rainbow.html
-	@$(LINKS) $< > $@
-
-ripples.txt: html/ripples.html
-	@$(LINKS) $< > $@
-
-smudge.txt: html/smudge.html
-	@$(LINKS) $< > $@
-
-light.txt: html/light.html
-	@$(LINKS) $< > $@
-
-shift.txt: html/shift.html
-	@$(LINKS) $< > $@
-
-tint.txt: html/tint.html
-	@$(LINKS) $< > $@
-
-waves.txt: html/waves.html
-	@$(LINKS) $< > $@
+include ../../docs/Makefile