diff --git a/web/swdb.mac b/web/swdb.mac
index b23b2cd..9adaf35 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -1,218 +1,218 @@
 # Version information
 # Please run make in this directory after changing this file.
 
 #
 # Primary FTP server base directory
 #
 #+macro: ftp_base  ftp://ftp.gnupg.org/gcrypt
 #+macro: ftp_loc_base  /ftp/gcrypt
 
 #
 # GnuPG-2.2
 #
 #+macro: gnupg22_ver  2.2.7
 #+macro: gnupg22_date 2018-05-02
 #+macro: gnupg22_size 6475k
 #+macro: gnupg22_sha1 e222cda63409a86992369df8976f6c7511e10ea0
 #+macro: gnupg22_sha2 d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e
 #+macro: gnupg22_branch  STABLE-BRANCH-2-2
 #+macro: gnupg22_w32_ver  2.2.7_20180502
 #+macro: gnupg22_w32_date 2018-05-02
 #+macro: gnupg22_w32_size 3914k
 #+macro: gnupg22_w32_sha1 a00f7119c85dd837336f13be3174178d0cf8d85e
 #+macro: gnupg22_w32_sha2 2d7ffedb1737e4dbed7f89377c3273b5cc27ee0fd9c70a417bd602203fc419ee
 
 
 #
 # GnuPG 2.0  (end-of-life)
 #
 #+macro: gnupg20_ver  2.0.31
 #+macro: gnupg20_date 2017-12-29
 #+macro: gnupg20_size 4324k
 #+macro: gnupg20_sha1 a7d5021a6a39dd67942e00a1239e37063edb00f0
 #+macro: gnupg20_sha2 095558cfbba52fba582963e97b0c016889570b4712d6b871abeef2cf93e62293
 #+macro: gnupg20_branch  STABLE-BRANCH-2-0
 
 
 #
 # GnuPG-1
 #
 #+macro: gnupg1_ver  1.4.22
 #+macro: gnupg1_date 2017-07-19
 #+macro: gnupg1_size 3658k
 #+macro: gnupg1_sha1 4bad84fba712626cbbd5adf20988788028c5a5a6
 #+macro: gnupg1_sha2 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4
 #
 #+macro: gnupg1_w32cli_ver  1.4.22
 #+macro: gnupg1_w32cli_size 2372k
 #+macro: gnupg1_w32cli_sha1 27b8069872d6d2b271222ffb9322dbd6197b0b89
 
 
 #
 # Gpg4win
 #
-#+macro: gpg4win_ver  3.1.0
-#+macro: gpg4win_date 2018-04-13
-#+macro: gpg4win_src_size 5292k
-#+macro: gpg4win_src_sha1 d0a0c7665d4bc724a5f1a83763c526754be47024
-#+macro: gpg4win_src_sha2 6d697372ec4c75a29c6daa6aca00060455825966c079efac6370140929b2c4f8
-#+macro: gpg4win_exe_size 27592k
-#+macro: gpg4win_exe_sha1 fb9f39199d7b096d1397dad4aa0719de5ff05b31
-#+macro: gpg4win_exe_sha2 a416aca375a80eada7edc69efdf3757988310a2f1723cd6190d9e3113d787301
-#+macro: gpg4win_isrc_size 222756k
-#+macro: gpg4win_isrc_sha1 23e9a6bc7fb1eceda7ece3a6655a09789c673ef5
-#+macro: gpg4win_isrc_sha2 ca40ade2dcb55f08d412d768f7946f9199a28edc189c4dc430dcd990b2fb8315
+#+macro: gpg4win_ver  3.1.1
+#+macro: gpg4win_date 2018-05-03
+#+macro: gpg4win_src_size 5300k
+#+macro: gpg4win_src_sha1 dc0bc06c7d57be522177ee05200f704e8103bc59
+#+macro: gpg4win_src_sha2 3a98b015cbcaa5faa24a564bfbb52ac08a653bcbcd869c6e42f36b9152145b6b
+#+macro: gpg4win_exe_size 27680k
+#+macro: gpg4win_exe_sha1 369040c292358d68d8328d5a9b97d71f80cdf3d7
+#+macro: gpg4win_exe_sha2 b2144904f103dad48328fe125eb182c4dcfbe8093d48b74691613e0d2ed26033
+#+macro: gpg4win_isrc_size 222860k
+#+macro: gpg4win_isrc_sha1 b3e4e57ecb05308aeff8e30876c0c4ce956b0234
+#+macro: gpg4win_isrc_sha2 bd2219638a2c0856f28c2c415c5a89a263885a31c4e141552348d9ae7bf3bbac
 
 
 #
 # GPA
 #
 #+macro: gpa_ver  0.9.10
 #+macro: gpa_date 2016-11-19
 #+macro: gpa_size 745k
 #+macro: gpa_sha1 c629348725c1bf5dafd57f8a70187dc89815ce60
 #+macro: gpa_sha2 c3b9cc36fd9916e83524930f99df13b1d5f601f4c0168cb9f5d81422e282b727
 
 
 #
 # PINENTRY
 #
 #+macro: pinentry_ver  1.1.0
 #+macro: pinentry_date 2017-12-03
 #+macro: pinentry_size 456k
 #+macro: pinentry_sha1 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0
 #+macro: pinentry_sha2 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
 
 
 #
 # GPGME
 #
 #+macro: gpgme_ver  1.11.1
 #+macro: gpgme_date 2018-04-20
 #+macro: gpgme_size 1385k
 #+macro: gpgme_sha1 95b1fc427871ca8d30d6d3b1985c816fe0b5077b
 #+macro: gpgme_sha2 2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f
 
 
 #
 # LIBGCRYPT
 #
 #+macro: libgcrypt_ver  1.8.2
 #+macro: libgcrypt_date 2017-12-13
 #+macro: libgcrypt_size 2897k
 #+macro: libgcrypt_sha1 ab8aae5d7a68f8e0988f90e11e7f6a4805af5c8d
 #+macro: libgcrypt_sha2 c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07
 
 
 #
 # LIBKSBA
 #
 #+macro: libksba_ver  1.3.5
 #+macro: libksba_date 2016-08-22
 #+macro: libksba_size 606k
 #+macro: libksba_sha1 a98385734a0c3f5b713198e8d6e6e4aeb0b76fde
 #+macro: libksba_sha2 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340
 
 
 #
 # DirMngr (not any longer needed)
 #
 #+macro: dirmngr_ver  1.1.1
 #+macro: dirmngr_date 2013-04-26
 #+macro: dirmngr_size 554k
 #+macro: dirmngr_sha1 e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 
 
 #
 # LIBGPG-ERROR
 #
 #+macro: libgpg_error_ver  1.31
 #+macro: libgpg_error_date 2018-05-02
 #+macro: libgpg_error_size 880k
 #+macro: libgpg_error_sha1 2bafad316d4e3e12bae4822b14ed9020090e6acf
 #+macro: libgpg_error_sha2 40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef
 #+macro: gpgrt_ver  1.31
 #+macro: gpgrt_date 2018-05-02
 #+macro: gpgrt_size 880k
 #+macro: gpgrt_sha1 2bafad316d4e3e12bae4822b14ed9020090e6acf
 #+macro: gpgrt_sha2 40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef
 
 
 #
 # LIBASSUAN
 #
 #+macro: libassuan_ver  2.5.1
 #+macro: libassuan_date 2017-12-07
 #+macro: libassuan_size 551k
 #+macro: libassuan_sha1 c8432695bf1daa914a92f51e911881ed93d50604
 #+macro: libassuan_sha2 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
 
 
 #
 # NTBTLS
 #
 #+macro: ntbtls_ver  0.1.2
 #+macro: ntbtls_date 2017-09-19
 #+macro: ntbtls_size 334k
 #+macro: ntbtls_sha1 05cf57cd8400b338b94bdce7287397c24315ac49
 #+macro: ntbtls_sha2 8240db84e50c2351b19eb8064bdfd4d25e3c157d37875c62e335df237d7bdce7
 
 
 #
 # nPth
 #
 #+macro: npth_ver  1.5
 #+macro: npth_date 2017-06-02
 #+macro: npth_size 292k
 #+macro: npth_sha1 93ddf1a3bdbca00fb4cf811498094ca61bbb8ee1
 #+macro: npth_sha2 294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2
 
 
 #
 # GpgEX
 #
 #+macro: gpgex_ver  1.0.6
 #+macro: gpgex_date 2018-04-10
 #+macro: gpgex_size 297k
 #+macro: gpgex_sha1 443270219d542f97b6f124d2101ae8d803c6dbe2
 #+macro: gpgex_sha2 d69898d1022400bd09bb684080edc95be554af736ae9c014df73543f34f7481b
 
 
 #
 # GpgOL
 #
 #+macro: gpgol_ver  2.1.1
 #+macro: gpgol_date 2018-04-24
 #+macro: gpgol_size 778k
 #+macro: gpgol_sha1 d6851487baefec52ab97c3ecfcf9653c392e949f
 #+macro: gpgol_sha2 406e97f14f332b501b05e2589495b65358e2b70c777324b63587d4507155ed98
 
 
 #
 # ADNS
 #
 #+macro: adns_ver  1.4-g10-7
 #+macro: adns_date 2015-11-20
 #+macro: adns_sha1 d2e089d98d3faed6cad009477cc0bc030b35c646
 
 
 #
 # zlib (mirrored at our server)
 #
 #+macro: zlib_ver     1.2.8
 #+macro: zlib_sha1_gz a4d316c404ff54ca545ea71a27af7dbc29817088
 
 #
 # bzip2 (mirrored and stripped down version)
 #
 #+macro: bzip2_ver     1.0.6-g10
 #+macro: bzip2_sha1_gz 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
 
 #
 # SQLite (mirrored at our server)
 #
 #+macro: sqlite_ver     3120200
 #+macro: sqlite_sha1_gz b43c2e7238e54c50b95fbbd85c48792f4f39af8c
 
 
 # --- end of swdb.mac ---