diff --git a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
index e44e094..9c0da60 100644
--- a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
+++ b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreelayout
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
index 7ffde4c..239d2da 100644
--- a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
+++ b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatesnonfreepresnt
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/extras/source/premium/templates/common/layout/makefile.mk b/extras/source/premium/templates/common/layout/makefile.mk
index c78dab5..470210a 100644
--- a/extras/source/premium/templates/common/layout/makefile.mk
+++ b/extras/source/premium/templates/common/layout/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonlayout
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= * -x makefile.*
 
 
diff --git a/extras/source/premium/templates/common/presnt/makefile.mk b/extras/source/premium/templates/common/presnt/makefile.mk
index 2d5ea56..d27aa0d 100644
--- a/extras/source/premium/templates/common/presnt/makefile.mk
+++ b/extras/source/premium/templates/common/presnt/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatescommonpresnt
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= * -x makefile.*
 
 
diff --git a/extras/source/premium/templates/layout/lang/makefile.mk b/extras/source/premium/templates/layout/lang/makefile.mk
index 31c277b..b664c12 100644
--- a/extras/source/premium/templates/layout/lang/makefile.mk
+++ b/extras/source/premium/templates/layout/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplateslayout
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/extras/source/premium/templates/presnt/lang/makefile.mk b/extras/source/premium/templates/presnt/lang/makefile.mk
index 74eb712..6f2e185 100644
--- a/extras/source/premium/templates/presnt/lang/makefile.mk
+++ b/extras/source/premium/templates/presnt/lang/makefile.mk
@@ -40,7 +40,7 @@ TARGET=premiumtemplatespresnt
 
 
 ZIP1TARGET      = $(PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/extras/source/templates/lang/makefile.mk b/extras/source/templates/lang/makefile.mk
index c0cc6e1..cfe7f54 100644
--- a/extras/source/templates/lang/makefile.mk
+++ b/extras/source/templates/lang/makefile.mk
@@ -38,7 +38,7 @@ TARGET=templatesgeneral
 
 
 ZIP1TARGET      = $(TEMPLATE_ROOT_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/extras/source/templates/layout/makefile.mk b/extras/source/templates/layout/makefile.mk
index 8fac992..7b55170 100644
--- a/extras/source/templates/layout/makefile.mk
+++ b/extras/source/templates/layout/makefile.mk
@@ -36,7 +36,8 @@ TARGET=templateslayout
 .INCLUDE : $(PRJ)$/util$/target.pmk
 
 ZIP1TARGET      = $(TEMPLATE_LAYOUT_IMPRESS_TARGET)
-ZIP1LIST        = * -x makefile -x delzip
+ZIP1STRIPLANGUAGETAGS=1
+ZIP1LIST        = * -x makefile.* -x delzip
 
 .INCLUDE : target.mk
 
diff --git a/extras/source/templates/presnt/lang/makefile.mk b/extras/source/templates/presnt/lang/makefile.mk
index fb89d31..8fa2c5e 100644
--- a/extras/source/templates/presnt/lang/makefile.mk
+++ b/extras/source/templates/presnt/lang/makefile.mk
@@ -38,7 +38,7 @@ TARGET=templatespresnt
 
 
 ZIP1TARGET      = $(TEMPLATE_PRESNT_IMPRESS_TARGET)
-
+ZIP1STRIPLANGUAGETAGS=1
 ZIP1LIST	= $(LANGDIR)$/*
 
 
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 608819d..8f36e1a 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -14,6 +14,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP1TARGET)"!=""
 
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP1EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
@@ -117,6 +122,11 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 0a0364e..9193a1f 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -42,6 +42,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
 
 .IF "$(ZIP$(TNR)TARGET)"!=""
 
+.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
 ZIP$(TNR)EXT*=.zip
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
@@ -145,6 +150,11 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
     $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
         $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
         $(FI)
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+        $(SOLARENV)/bin/striplanguagetags.sh $@ \
+        $(FI)
+.ENDIF
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ENDIF
--- /dev/null	2011-01-05 23:37:58.675000000 +0000
+++ b/solenv/bin/striplanguagetags.sh	2011-01-07 16:33:03.000000000 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+XSL=`mktemp`
+
+cat > $XSL << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+
+<xsl:template match="node()|@*">
+  <xsl:copy>
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="@fo:language"/>
+<xsl:template match="@fo:country"/>
+
+</xsl:stylesheet>
+EOF
+
+WRKDIR=`mktemp -d`
+unzip -q $1 -d $WRKDIR
+pushd $WRKDIR
+for a in *; do
+    unzip -qc $a styles.xml > styles.tmp
+    eval "$CALLXSLTPROC -o styles.xml $XSL styles.tmp"
+    zip -qr $a styles.xml
+done
+popd
+zip -qrj $1 $WRKDIR
+rm -rf $WRKDIR
+rm -f $XSL