diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0a976b2b0..8851ad87a 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-13  David Shaw  <dshaw@jabberwocky.com>
+
+	* mk-w32-dist: Don't use iconv for pl.po.  From Werner on stable
+	branch.
+
+	* mk-w32-dist: Include gpgkeys_ldap and gpgkeys_hkp.
+
 2002-11-12  Werner Koch  <wk@gnupg.org>
 
 	* config.sub, config.guess: Updated from ftp.gnu.org/gnu/config
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 378278a99..96590d8ca 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -40,6 +40,10 @@ cp ${bindir}/g10/gpg.exe gpg.exe
 mingw32 strip gpg.exe
 cp ${bindir}/g10/gpgv.exe gpgv.exe
 mingw32 strip gpgv.exe
+cp ${bindir}/keyserver/gpgkeys_ldap.exe gpgkeys_ldap.exe
+mingw32 strip gpgkeys_ldap.exe
+cp ${bindir}/keyserver/gpgkeys_hkp.exe gpgkeys_hkp.exe
+mingw32 strip gpgkeys_hkp.exe
 cp ${bindir}/tools/gpgsplit.exe gpgsplit.exe
 mingw32 strip gpgsplit.exe
 
@@ -66,11 +70,12 @@ 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`
+   # pl is also cp1250 but the current PO file can't be converted.
    case $lang in 
-     cs|pl) toset="CP1250" ;;
+     cs) toset="CP1250" ;;  
      tr) toset="CP1254" ;;   # DOS: CP857
      el) toset="CP1253" ;;   # same as latin-7?
-     el|eo|et|ja) toset="" ;;
+     el|eo|et|ja|pl) toset="" ;;
       *) toset="CP850" ;;
    esac
    if [ -n "$toset" ]; then