diff --git a/web/swdb.mac b/web/swdb.mac
index 728531b..6ea2f34 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -1,195 +1,195 @@
 # 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
 #
 #+macro: gnupg_ver  2.0.30
 #+macro: gnupg_date 2016-03-31
 #+macro: gnupg_size 4311k
 #+macro: gnupg_sha1 a9f024588c356a55e2fd413574bfb55b2e18794a
 #+macro: gnupg_sha2 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71
 #+macro: gnupg_branch  STABLE-BRANCH-2-0
 
 
 #
 # GnuPG-2.1
 #
-#+macro: gnupg21_ver  2.1.21
-#+macro: gnupg21_date 2017-05-15
-#+macro: gnupg21_size 6321k
-#+macro: gnupg21_sha1 1852c066bc21893bc52026ead78edf50fdf15e13
-#+macro: gnupg21_sha2 7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd
-#+macro: gnupg21_w32_ver  2.1.21_20170515
-#+macro: gnupg21_w32_date 2017-05-15
-#+macro: gnupg21_w32_size 3761k
-#+macro: gnupg21_w32_sha1 f8a75914e8d82375a89e39fbf45d9f72ed8ab92c
-#+macro: gnupg21_w32_sha2 ae4af56d069cebe82b5891e67b54cd297c4799f5d590fc1c678bbd9cd7b932b2
+#+macro: gnupg21_ver  2.1.22
+#+macro: gnupg21_date 2017-07-28
+#+macro: gnupg21_size 6377k
+#+macro: gnupg21_sha1 706b806f7d8d328b4ffa67954c613fdd3dfed1b9
+#+macro: gnupg21_sha2 46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7
+#+macro: gnupg21_w32_ver  2.1.22_20170728
+#+macro: gnupg21_w32_date 2017-07-28
+#+macro: gnupg21_w32_size 3791k
+#+macro: gnupg21_w32_sha1 9e517a550da5619445be6820a614faf3e1bb5a46
+#+macro: gnupg21_w32_sha2 c5e65b55fed2b6f3e04565391a0ba1027acf32e5d9d61b1fec032b01b4e76a58
 
 
 #
 # 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
 
 
 #
 # 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.0.0
 #+macro: pinentry_date 2016-11-22
 #+macro: pinentry_size 427k
 #+macro: pinentry_sha1 85d9ac81ebad3fb082514c505c90c39a0456f1f6
 #+macro: pinentry_sha2 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
 
 
 #
 # GPGME
 #
 #+macro: gpgme_ver  1.9.0
 #+macro: gpgme_date 2017-03-28
 #+macro: gpgme_size 1312k
 #+macro: gpgme_sha1 870719cd3d2ef6a7fcb1d6af9ce5446edba7bfc3
 #+macro: gpgme_sha2 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 
 
 #
 # LIBGCRYPT
 #
 #+macro: libgcrypt_ver  1.8.0
 #+macro: libgcrypt_date 2017-07-18
 #+macro: libgcrypt_size 2893k
 #+macro: libgcrypt_sha1 b4ffb20369f2ab8249d5cc0fb8b3b31371f6b112
 #+macro: libgcrypt_sha2 23e49697b87cc4173b03b4757c8df4314e3149058fa18bdc4f82098f103d891b
 
 
 #
 # 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
 #
 #+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.27
 #+macro: libgpg_error_date 2017-02-28
 #+macro: libgpg_error_size 794k
 #+macro: libgpg_error_sha1 a428758999ff573e62d06892e3d2c0b0f335787c
 #+macro: libgpg_error_sha2 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
 
 
 #
 # LIBASSUAN
 #
 #+macro: libassuan_ver  2.4.3
 #+macro: libassuan_date 2016-07-14
 #+macro: libassuan_size 546k
 #+macro: libassuan_sha1 27391cf4a820b5350ea789c30661830c9a271518
 #+macro: libassuan_sha2 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
 
 
 #
 # NTBTLS
 #
 #+macro: ntbtls_ver  0.1.1
 #+macro: ntbtls_date 2017-03-16
 #+macro: ntbtls_size 333k
 #+macro: ntbtls_sha1 6c0aacc43f7cd0695ad21463d94e7baf99215149
 #+macro: ntbtls_sha2 2d274ce64d2ac7613ed8f7ed7094332d50ac16916d1ebf1fc87b1018df146234
 
 
 #
 # 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.4
 #+macro: gpgex_date 2016-03-30
 #+macro: gpgex_size 286k
 #+macro: gpgex_sha1 a1521fd86b6a1c5d5865d864e5700e98f4e99dcb
 #+macro: gpgex_sha2 aea2232d026219072491f1bf5b2f189a15552f66377ff4dd3b11c0f069379206
 
 #
 # GpgOL
 #
 #+macro: gpgol_ver  1.4.0
 #+macro: gpgol_date 2016-03-30
 #+macro: gpgol_size 648k
 #+macro: gpgol_sha1 3cbe4a1dc0b9897353d8352a4b5afa3ecf3094f4
 #+macro: gpgol_sha2 abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f
 
 
 #
 # 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 ---