diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 83d5e4e35c..4cd9df3716 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -372,6 +372,9 @@ set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
 set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
 set_default XSLTPROCFLAGS ""
 
+set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
+set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
+
 ### Local Variables: ***
 ### sh-basic-offset: 4 ***
 ### indent-tabs-mode: nil ***
diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh
index b39464212d..43fe91a5ad 100755
--- a/packaging/win32/dist-impl.sh
+++ b/packaging/win32/dist-impl.sh
@@ -44,6 +44,7 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _INNO_UDIR=`unix_path $INNO_DIR`
     _WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
+	_ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
     add_to_env $_UNZIP_UDIR/bin PATH # unzip
     add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
     add_to_env $_EXETYPE_UDIR/bin PATH # exetype
@@ -128,6 +129,12 @@ function dist_gnome() {
     rm -rf $DIST_UDIR/lib/locale
 }
 
+function dist_isocodes() {
+    setup isocodes
+    mkdir -p $DIST_UDIR/share
+    cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
+}
+
 function dist_pcre() {
     setup pcre
     mkdir -p $DIST_UDIR/bin
diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index 14e59f14a8..ca6122c86e 100755
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -20,6 +20,7 @@ add_step dist_regex
 add_step dist_autotools
 add_step dist_guile
 add_step dist_gnome
+add_step dist_isocodes
 add_step dist_pcre
 add_step dist_libbonoboui
 add_step dist_libgsf
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index 255ea63052..a7e252fded 100755
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -648,6 +648,27 @@ EOF
     [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
 }
 
+function inst_isocodes() {
+    setup isocodes
+    _ISOCODES_UDIR=`unix_path ${ISOCODES_DIR}`
+    add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
+    if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
+    then
+        echo "isocodes already installed. skipping."
+    else
+        wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/iso-codes-*
+        qpushd $TMP_UDIR/iso-codes-*
+            ./configure ${HOST_XCOMPILE} \
+                --prefix=${_ISOCODES_UDIR}
+            make
+            make install
+        qpopd
+        quiet [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ] || die "isocodes not installed correctly"
+        rm -rf ${TMP_UDIR}/iso-codes-*
+    fi
+}
+
 function inst_swig() {
     setup Swig
     _SWIG_UDIR=`unix_path $SWIG_DIR`
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 5530998eb3..53afa01661 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -87,6 +87,7 @@ add_step inst_gnome
 if [ "$AQBANKING3" = "yes" ]; then
  add_step inst_gnutls
 fi
+add_step inst_isocodes
 add_step inst_swig
 add_step inst_pcre
 add_step inst_libbonoboui