contained within ../Makefile.common now

CVS version numbers

arabic/Make.common: 1.5 -> 1.6 
arabic/Make.dep.generic: 1.1 -> 1.2 
arabic/Make.dep.templ: 1.1 -> 1.2 
arabic/Make.lang: 1.2 -> 1.3 
croatian/Make.common: 1.9 -> 1.10 
croatian/Make.dep.generic: 1.2 -> 1.3 
croatian/Make.dep.templ: 1.4 -> 1.5 
croatian/Make.lang: 1.3 -> 1.4 
danish/Make.common: 1.7 -> 1.8 
danish/Make.dep.generic: 1.2 -> 1.3 
danish/Make.dep.templ: 1.2 -> 1.3 
danish/Make.lang: 1.3 -> 1.4 
dutch/Make.common: 1.3 -> 1.4 
dutch/Make.dep.generic: 1.1 -> 1.2 
dutch/Make.dep.templ: 1.1 -> 1.2 
dutch/Make.lang: 1.1 -> 1.2 
english/Make.common: 1.17 -> 1.18 
english/Make.dep.generic: 1.3 -> 1.4 
english/Make.dep.templ: 1.9 -> 1.10 
english/Make.lang: 1.11 -> 1.12 
esperanto/Make.common: 1.5 -> 1.6 
esperanto/Make.dep.generic: 1.1 -> 1.2 
esperanto/Make.dep.templ: 1.1 -> 1.2 
esperanto/Make.lang: 1.2 -> 1.3 
finnish/Make.common: 1.6 -> 1.7 
finnish/Make.dep.generic: 1.1 -> 1.2 
finnish/Make.dep.templ: 1.1 -> 1.2 
finnish/Make.lang: 1.2 -> 1.3 
french/Make.common: 1.9 -> 1.10 
french/Make.dep.generic: 1.2 -> 1.3 
french/Make.dep.templ: 1.3 -> 1.4 
french/Make.lang: 1.4 -> 1.5 
german/Make.common: 1.9 -> 1.10 
german/Make.dep.generic: 1.4 -> 1.5 
german/Make.dep.templ: 1.4 -> 1.5 
german/Make.lang: 1.5 -> 1.6 
hungarian/Make.common: 1.5 -> 1.6 
hungarian/Make.dep.generic: 1.1 -> 1.2 
hungarian/Make.dep.templ: 1.1 -> 1.2 
hungarian/Make.lang: 1.2 -> 1.3 
italian/Make.common: 1.8 -> 1.9 
italian/Make.dep.generic: 1.2 -> 1.3 
italian/Make.dep.templ: 1.2 -> 1.3 
italian/Make.lang: 1.4 -> 1.5 
norwegian/Make.common: 1.6 -> 1.7 
norwegian/Make.dep.generic: 1.1 -> 1.2 
norwegian/Make.dep.templ: 1.1 -> 1.2 
norwegian/Make.lang: 1.2 -> 1.3 
polish/Make.common: 1.8 -> 1.9 
polish/Make.dep.generic: 1.3 -> 1.4 
polish/Make.dep.templ: 1.2 -> 1.3 
polish/Make.lang: 1.4 -> 1.5 
portuguese/Make.common: 1.6 -> 1.7 
portuguese/Make.dep.generic: 1.1 -> 1.2 
portuguese/Make.dep.templ: 1.1 -> 1.2 
portuguese/Make.lang: 1.2 -> 1.3 
romanian/Make.common: 1.5 -> 1.6 
romanian/Make.dep.generic: 1.1 -> 1.2 
romanian/Make.dep.templ: 1.1 -> 1.2 
romanian/Make.lang: 1.2 -> 1.3 
russian/Make.common: 1.5 -> 1.6 
russian/Make.dep.generic: 1.1 -> 1.2 
russian/Make.dep.templ: 1.1 -> 1.2 
russian/Make.lang: 1.2 -> 1.3 
spanish/Make.common: 1.9 -> 1.10 
spanish/Make.dep.generic: 1.4 -> 1.5 
spanish/Make.dep.templ: 1.2 -> 1.3 
spanish/Make.lang: 1.4 -> 1.5 
swedish/Make.common: 1.6 -> 1.7 
swedish/Make.dep.generic: 1.1 -> 1.2 
swedish/Make.dep.templ: 1.1 -> 1.2 
swedish/Make.lang: 1.2 -> 1.3 
turkish/Make.common: 1.5 -> 1.6 
turkish/Make.dep.generic: 1.1 -> 1.2 
turkish/Make.dep.templ: 1.1 -> 1.2 
turkish/Make.lang: 1.2 -> 1.3

76 files changed, 95 insertions, 2461 deletions

diff --git a/arabic/Make.common b/arabic/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/arabic/Make.common
+++ b/arabic/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/arabic/Make.dep.generic b/arabic/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/arabic/Make.dep.generic
+++ b/arabic/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/arabic/Make.dep.templ b/arabic/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/arabic/Make.dep.templ
+++ b/arabic/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/arabic/Make.lang b/arabic/Make.lang
index d10aefa55b6..ebea66b8ddd 100644
--- a/arabic/Make.lang
+++ b/arabic/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=ar
-LANGUAGECAP=AR
+# The two-letter code for the language
+LANGUAGE := ar
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/croatian/Make.common b/croatian/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/croatian/Make.common
+++ b/croatian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/croatian/Make.dep.generic b/croatian/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/croatian/Make.dep.generic
+++ b/croatian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/croatian/Make.dep.templ b/croatian/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/croatian/Make.dep.templ
+++ b/croatian/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/croatian/Make.lang b/croatian/Make.lang
index 9642d53b65a..010aea096a7 100644
--- a/croatian/Make.lang
+++ b/croatian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=hr
-LANGUAGECAP=HR
+# The two-letter code for the language
+LANGUAGE := da
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/danish/Make.common b/danish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/danish/Make.common
+++ b/danish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/danish/Make.dep.generic b/danish/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/danish/Make.dep.generic
+++ b/danish/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/danish/Make.dep.templ b/danish/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/danish/Make.dep.templ
+++ b/danish/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/danish/Make.lang b/danish/Make.lang
index 4b5f3a7559c..010aea096a7 100644
--- a/danish/Make.lang
+++ b/danish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=da
-LANGUAGECAP=DA
+# The two-letter code for the language
+LANGUAGE := da
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/dutch/Make.common b/dutch/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/dutch/Make.common
+++ b/dutch/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/dutch/Make.dep.generic b/dutch/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/dutch/Make.dep.generic
+++ b/dutch/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/dutch/Make.dep.templ b/dutch/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/dutch/Make.dep.templ
+++ b/dutch/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/dutch/Make.lang b/dutch/Make.lang
index 776eb9b46a1..acc2edd781a 100644
--- a/dutch/Make.lang
+++ b/dutch/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=nl
-LANGUAGECAP=NL
+# The two-letter code for the language
+LANGUAGE := nl
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/english/Make.common b/english/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/english/Make.common
+++ b/english/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/english/Make.dep.generic b/english/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/english/Make.dep.generic
+++ b/english/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/english/Make.dep.templ b/english/Make.dep.templ
index d6e6845bfb8..e69de29bb2d 100644
--- a/english/Make.dep.templ
+++ b/english/Make.dep.templ
@@ -1,40 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
-
-$(TEMPLDIR)/security.wml: $(TEMPLDIR)/common_translation.wml \
-		$(TEMPLDIR)/basic.wml $(TEMPLDIR)/fixes_link.wml \
-		$(TEMPLDIR)/languages.wml $(TEMPLDIR)/ctime.wml \
-		$(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/security.wml
-
-$(TEMPLDIR)/ddp.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/languages.wml \
-		$(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/ddp.wml
diff --git a/english/Make.lang b/english/Make.lang
index 5dce0e7b036..ff5c14c8b25 100644
--- a/english/Make.lang
+++ b/english/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=en
-LANGUAGECAP=EN
+# The two-letter code for the language
+LANGUAGE := en
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/esperanto/Make.common b/esperanto/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/esperanto/Make.common
+++ b/esperanto/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/esperanto/Make.dep.generic b/esperanto/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/esperanto/Make.dep.generic
+++ b/esperanto/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/esperanto/Make.dep.templ b/esperanto/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/esperanto/Make.dep.templ
+++ b/esperanto/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/esperanto/Make.lang b/esperanto/Make.lang
index 2b23a1a3bb9..1d420d412ef 100644
--- a/esperanto/Make.lang
+++ b/esperanto/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=eo
-LANGUAGECAP=EO
+# The two-letter code for the language
+LANGUAGE := eo
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/finnish/Make.common b/finnish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/finnish/Make.common
+++ b/finnish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/finnish/Make.dep.generic b/finnish/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/finnish/Make.dep.generic
+++ b/finnish/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/finnish/Make.dep.templ b/finnish/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/finnish/Make.dep.templ
+++ b/finnish/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/finnish/Make.lang b/finnish/Make.lang
index 19ed53e6332..6456f1c4870 100644
--- a/finnish/Make.lang
+++ b/finnish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=fi
-LANGUAGECAP=FI
+# The two-letter code for the language
+LANGUAGE := fi
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/french/Make.common b/french/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/french/Make.common
+++ b/french/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/french/Make.dep.generic b/french/Make.dep.generic
index a7fd63ccf57..e69de29bb2d 100644
--- a/french/Make.dep.generic
+++ b/french/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/french/Make.dep.templ b/french/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/french/Make.dep.templ
+++ b/french/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/french/Make.lang b/french/Make.lang
index cb0dd5b64e7..9b7c8fa7029 100644
--- a/french/Make.lang
+++ b/french/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=fr
-LANGUAGECAP=FR
+# The two-letter code for the language
+LANGUAGE := fr
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/german/Make.common b/german/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/german/Make.common
+++ b/german/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/german/Make.dep.generic b/german/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/german/Make.dep.generic
+++ b/german/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/german/Make.dep.templ b/german/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/german/Make.dep.templ
+++ b/german/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/german/Make.lang b/german/Make.lang
index 6beff065be6..a8c718356be 100644
--- a/german/Make.lang
+++ b/german/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=de
-LANGUAGECAP=DE
+# The two-letter code for the language
+LANGUAGE := de
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/hungarian/Make.common b/hungarian/Make.common
index beed77aea4a..e69de29bb2d 100644
--- a/hungarian/Make.common
+++ b/hungarian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.e;s)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/hungarian/Make.dep.generic b/hungarian/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/hungarian/Make.dep.generic
+++ b/hungarian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/hungarian/Make.dep.templ b/hungarian/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/hungarian/Make.dep.templ
+++ b/hungarian/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/hungarian/Make.lang b/hungarian/Make.lang
index 57de37f8179..1ed187c8b3d 100644
--- a/hungarian/Make.lang
+++ b/hungarian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=hu
-LANGUAGECAP=HU
+# The two-letter code for the language
+LANGUAGE := hu
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/italian/Make.common b/italian/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/italian/Make.common
+++ b/italian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/italian/Make.dep.generic b/italian/Make.dep.generic
index a7fd63ccf57..e69de29bb2d 100644
--- a/italian/Make.dep.generic
+++ b/italian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html: %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/italian/Make.dep.templ b/italian/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/italian/Make.dep.templ
+++ b/italian/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/italian/Make.lang b/italian/Make.lang
index 39aa70a99bc..63588baa4b5 100644
--- a/italian/Make.lang
+++ b/italian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=it
-LANGUAGECAP=IT
+# The two-letter code for the language
+LANGUAGE := it
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/norwegian/Make.common b/norwegian/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/norwegian/Make.common
+++ b/norwegian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/norwegian/Make.dep.generic b/norwegian/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/norwegian/Make.dep.generic
+++ b/norwegian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/norwegian/Make.dep.templ b/norwegian/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/norwegian/Make.dep.templ
+++ b/norwegian/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/norwegian/Make.lang b/norwegian/Make.lang
index 097e58bacad..55b7dba2344 100644
--- a/norwegian/Make.lang
+++ b/norwegian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=no
-LANGUAGECAP=NO
+# The two-letter code for the language
+LANGUAGE := no
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/polish/Make.common b/polish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/polish/Make.common
+++ b/polish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/polish/Make.dep.generic b/polish/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/polish/Make.dep.generic
+++ b/polish/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/polish/Make.dep.templ b/polish/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/polish/Make.dep.templ
+++ b/polish/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/polish/Make.lang b/polish/Make.lang
index f2029248554..c2198737c53 100644
--- a/polish/Make.lang
+++ b/polish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=pl
-LANGUAGECAP=PL
+# The two-letter code for the language
+LANGUAGE := pl
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/portuguese/Make.common b/portuguese/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/portuguese/Make.common
+++ b/portuguese/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/portuguese/Make.dep.generic b/portuguese/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/portuguese/Make.dep.generic
+++ b/portuguese/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/portuguese/Make.dep.templ b/portuguese/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/portuguese/Make.dep.templ
+++ b/portuguese/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/portuguese/Make.lang b/portuguese/Make.lang
index 7d6a7c2ebb9..d9bc30ba43f 100644
--- a/portuguese/Make.lang
+++ b/portuguese/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=pt
-LANGUAGECAP=PT
+# The two-letter code for the language
+LANGUAGE := pt
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/romanian/Make.common b/romanian/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/romanian/Make.common
+++ b/romanian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/romanian/Make.dep.generic b/romanian/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/romanian/Make.dep.generic
+++ b/romanian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/romanian/Make.dep.templ b/romanian/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/romanian/Make.dep.templ
+++ b/romanian/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/romanian/Make.lang b/romanian/Make.lang
index 2be4bde6ebb..2cfdc92c178 100644
--- a/romanian/Make.lang
+++ b/romanian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=ro
-LANGUAGECAP=RO
+# The two-letter code for the language
+LANGUAGE := ro
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/russian/Make.common b/russian/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/russian/Make.common
+++ b/russian/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/russian/Make.dep.generic b/russian/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/russian/Make.dep.generic
+++ b/russian/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/russian/Make.dep.templ b/russian/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/russian/Make.dep.templ
+++ b/russian/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/russian/Make.lang b/russian/Make.lang
index 3c5dc7c8c05..3facdb061fc 100644
--- a/russian/Make.lang
+++ b/russian/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=ru
-LANGUAGECAP=RU
+# The two-letter code for the language
+LANGUAGE := ru
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/spanish/Make.common b/spanish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/spanish/Make.common
+++ b/spanish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/spanish/Make.dep.generic b/spanish/Make.dep.generic
index 543d511e242..e69de29bb2d 100644
--- a/spanish/Make.dep.generic
+++ b/spanish/Make.dep.generic
@@ -1,3 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
-	#$(WML) -D file=$(firstword $^) $(<F)
diff --git a/spanish/Make.dep.templ b/spanish/Make.dep.templ
index 1de7ea0fd4f..e69de29bb2d 100644
--- a/spanish/Make.dep.templ
+++ b/spanish/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/spanish/Make.lang b/spanish/Make.lang
index 185e28db552..f20479d3e3d 100644
--- a/spanish/Make.lang
+++ b/spanish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=es
-LANGUAGECAP=ES
+# The two-letter code for the language
+LANGUAGE := es
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/swedish/Make.common b/swedish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/swedish/Make.common
+++ b/swedish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/swedish/Make.dep.generic b/swedish/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/swedish/Make.dep.generic
+++ b/swedish/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/swedish/Make.dep.templ b/swedish/Make.dep.templ
index df2a96740ca..e69de29bb2d 100644
--- a/swedish/Make.dep.templ
+++ b/swedish/Make.dep.templ
@@ -1,28 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
diff --git a/swedish/Make.lang b/swedish/Make.lang
index 6e00b040c48..e7f8a9ddbd3 100644
--- a/swedish/Make.lang
+++ b/swedish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=sv
-LANGUAGECAP=SV
+# The two-letter code for the language
+LANGUAGE := sv
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below
diff --git a/turkish/Make.common b/turkish/Make.common
index ce38d81ad1f..e69de29bb2d 100644
--- a/turkish/Make.common
+++ b/turkish/Make.common
@@ -1,79 +0,0 @@
-# Nothing in here should require any modification
-# If you feel you need to modify something send mail
-# to debian-www explaining why so that others can benefit
-# from your improvements
-
-RELHTMLBASE=../../debian.org
-RELTEMPLDIR=../english/template/debian
-CUR_YEAR=$(shell date +%Y)
-
-HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
-TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
-# Do Not modify the following line
-ENGLISHSRCDIR=$(WMLBASE)/../english
-
-WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
-# all the binary file types should be added below.
-JPGSOURCE := $(wildcard *.jpg)
-JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
-GIFSOURCE := $(wildcard *.gif)
-GIFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(GIFSOURCE))
-PNGSOURCE := $(wildcard *.png)
-PNGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PNGSOURCE))
-PSSOURCE := $(wildcard *.ps.gz)
-PSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PSSOURCE))
-EPSSOURCE := $(wildcard *.eps)
-EPSDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(EPSSOURCE))
-PDFSOURCE := $(wildcard *.pdf)
-PDFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(PDFSOURCE))
-FIGSOURCE := $(wildcard *.fig)
-FIGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(FIGSOURCE))
-XCFSOURCE := $(wildcard *.xcf.gz)
-XCFDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(XCFSOURCE))
-IMGFILES := $(JPGSOURCE) $(GIFSOURCE) $(PNGSOURCE) $(PSSOURCE) $(EPSSOURCE) $(PDFSOURCE) $(FIGSOURCE) $(XCFSOURCE)
-IMGDESTFILES := $(JPGDESTFILES) $(GIFDESTFILES) $(PNGDESTFILES) $(PSDESTFILES) $(EPSDESTFILES) $(PDFDESTFILES) $(FIGDESTFILES) $(XCFDESTFILES)
-
-all:: $(HTMLFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i ; \
-		fi ; \
-	done
-
-install::
-	test -d $(HTMLDIR) || mkdir -p $(HTMLDIR)
-install:: $(HTMLDESTFILES) $(IMGDESTFILES)
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i install; \
-		fi ; \
-	done
-
-clean::
-	-rm -f *.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i clean; \
-		fi ; \
-	done
-
-cleandest::
-	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
-	@for i in $(SUBS) ''; do \
-		if [ -d "$$i" ]; then \
-			$(MAKE) -C $$i cleandest; \
-		fi ; \
-	done
-
-$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
-	@echo copying $(@F) to $(HTMLDIR)
-	-@cp $(@F) $(HTMLDIR)
-ifeq ($(LANGUAGE),en)
-	@echo making a link $(@D)/$(*F).html -\> $(@F)
-	-@ln -f -s $(@F) $(@D)/$(*F).html
-endif
-
-$(IMGDESTFILES): $(IMGFILES)
-	cp $(@F) $(HTMLDIR)
diff --git a/turkish/Make.dep.generic b/turkish/Make.dep.generic
index 244586d92b2..e69de29bb2d 100644
--- a/turkish/Make.dep.generic
+++ b/turkish/Make.dep.generic
@@ -1,2 +0,0 @@
-%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
-	$(WML) $(<F)
diff --git a/turkish/Make.dep.templ b/turkish/Make.dep.templ
index e754aa0bba1..e69de29bb2d 100644
--- a/turkish/Make.dep.templ
+++ b/turkish/Make.dep.templ
@@ -1,30 +0,0 @@
-# template dependencies
-
-$(TEMPLDIR)/basic.wml: $(TEMPLDIR)/navbar.wml
-	touch $(TEMPLDIR)/basic.wml
-
-$(TEMPLDIR)/footer.wml: $(TEMPLDIR)/ctime.wml
-	touch $(TEMPLDIR)/footer.wml
-
-$(TEMPLDIR)/menubar.wml: $(TEMPLDIR)/footer.wml
-	touch $(TEMPLDIR)/menubar.wml
-
-$(TEMPLDIR)/mainpage.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/menubar.wml
-	touch $(TEMPLDIR)/mainpage.wml
-
-$(TEMPLDIR)/template.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/template.wml
-
-$(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
-		$(TEMPLDIR)/languages.wml 
-	touch $(TEMPLDIR)/news.wml
-
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
-	touch $(TEMPLDIR)/consultant.wml
-
-$(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
-	touch $(TEMPLDIR)/event.wml
-
-$(TEMPLDIR)/navbar.wml: $(ENGLISHSRCDIR)/Pics/banner.jpg $(ENGLISHSRCDIR)/Pics/logo-50.jpg
-	touch $(TEMPLDIR)/navbar.wml
diff --git a/turkish/Make.lang b/turkish/Make.lang
index d0f90e0f38c..182ae8fb8b7 100644
--- a/turkish/Make.lang
+++ b/turkish/Make.lang
@@ -1,21 +1,7 @@
-# The LANGUAGE variable needs to be set for each language.
-# LANGUAGECAP is just the capitalization of LANGUAGE (this is needed for wml slices)
-LANGUAGE=tr
-LANGUAGECAP=TR
+# The two-letter code for the language
+LANGUAGE := tr
 
-# The '-q' forces wml to be quiet. Very useful in scripts.
-# It is sometimes useful to add '--epilog=weblint' to check for errors
-# in the html generated.
-# Other languages may want to change the wml command to execute programs
-# that get run before or after wml. For example,
-#    WML="wml -q --prolog="/usr/bin/tcs <options here>" \
-#                --epilog="/usr/bin/tcs <options here> > $(@D)/$(@F)" \
-#                -o $(@F)
-# If you use --epilog as above, then you will want to add a line to
-# Make.templ.inc to remove $(@F) after WML is done.
-WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y)
-WMLOUTFILE=$(@F)
-WMLPROLOG=
-WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+include $(WMLBASE)/../Makefile.common
 
+# If you need to modify that is already defined in ../Makefile.common
+# you can put it below