diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0d71c8972..04496455e 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-11  Werner Koch  <wk@gnupg.org>
+
+	* mk-w32-dist: Convert the character sets on a per language base.
+
 2002-09-02  Werner Koch  <wk@gnupg.org>
 
 	* mk-w32-dist: Include more man pages and gpg split.  Changed name
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 87207a50c..4f27a99b2 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -62,7 +62,25 @@ for i in README.W32 gnupg-w32.reg; do
   todos $i
 done
 
-for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done
+
+for i in ${srcdir}/po/*.po; do
+   lang=$(basename $i .po)
+   fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
+   case $lang in 
+     cs|pl) toset="CP1250" ;;
+     el|eo|et|ja|tr) toset="" ;;
+      *) toset="CP850" ;;
+   esac
+   if [ -n "$toset" ]; then
+       echo "$lang: converting from $fromset to $toset" >&2 
+       iconv --silent --from-code=$fromset --to-code=$toset < $i | \
+         sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=$toset/" | \
+         msgfmt --output-file=$lang.mo -
+   else
+       echo "$lang: keeping $fromset" >&2 
+       msgfmt --output-file=$lang.mo $i
+   fi
+done
 zip -9 "gnupg-w32cli-${version}.zip" *