diff --git a/blat.json b/blat.json
index 3b9afb43ad..4a6ce2c925 100644
--- a/blat.json
+++ b/blat.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.blat.net",
     "version": "3.2.19",
     "description": "A Windows command line utility that sends eMail using SMTP or post to usenet using NNTP.",
+    "homepage": "https://www.blat.net",
     "license": {
         "identifier": "Public Domain",
         "url": "https://www.blat.net/?docs/license.txt"
diff --git a/coreutils.json b/coreutils.json
index 25fc58df5f..e82b9c32f4 100644
--- a/coreutils.json
+++ b/coreutils.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "http://www.mingw.org/wiki/msys",
-    "description": "A collection of GNU utilities such as bash, make, gawk and grep",
-    "license": "GPL-2.0",
     "version": "5.97.3",
+    "description": "A collection of GNU utilities such as bash, make, gawk and grep",
+    "homepage": "http://www.mingw.org/wiki/msys",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys.RELEASE_NOTES.txt"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys.RELEASE_NOTES.txt"
     ],
     "hash": [
-        "41c7d5561662e41da74951f373a08a95db40b27b1246227bbbc13abc44976ea7",
-        "b533de0ee04dc4d53ca745210e41eb9437044ebd367c001f3615092e7214a4a3",
-        "f13de6d2e3c428e7f9a7251c6b01d6f7569e20f7ac126c68c028eb5f542473bb",
-        "62b58fe0880f0972fcc84a819265989b02439c1c5185870227bd25f870f7adb6",
-        "f8c7990416ea16a74ac336dcfe0f596bc46b8724b2d58cf8a3509414220b2366",
-        "256208bca7a86a10bc377bdccfe6fb8f1e1f1868d0d1952a6692ee9f1d985abd"
+        "sha1:fff020614bd796697739887c636f15a42b4b14aa",
+        "sha1:f4fd249ff5810b01fedc4a1dbdbe1b7d1e4cc619",
+        "sha1:2b64c42ac61c7ebd710333a6db2f35b21e4fccaf",
+        "sha1:e4273ccfde8ecf3a7631446fb2b01971a24ff9f7",
+        "sha1:54ac256a8f0c6a89f1b3c7758f3703b4e56382be",
+        "sha1:d5e3fc0f1450527b07259802f585d9186fa78c00"
     ],
     "bin": [
         "bin\\basename.exe",
diff --git a/file.json b/file.json
index 22d4514afc..6f83e1fdb4 100644
--- a/file.json
+++ b/file.json
@@ -1,14 +1,15 @@
 {
-    "homepage": "http://gnuwin32.sourceforge.net/packages/file.htm",
     "version": "5.03",
-    "license": "GPL-2.0",
+    "description": "Determine file type.",
+    "homepage": "http://gnuwin32.sourceforge.net/packages/file.htm",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/gnuwin32/files/file/5.03/file-5.03-bin.zip",
-        "https://sourceforge.net/projects/gnuwin32/files/file/5.03/file-5.03-dep.zip"
+        "https://downloads.sourceforge.net/projects/gnuwin32/file/5.03/file-5.03-bin.zip",
+        "https://downloads.sourceforge.net/projects/gnuwin32/file/5.03/file-5.03-dep.zip"
     ],
     "hash": [
-        "dbd28e191c1bf7e3db08b983e603e79959295717f6fc1032ba97e7a8680c8cf9",
-        "2dbf891e42c642e372e5b21b0528bb5ba3c5b6eeb9fb01fb1e9cc77f2f44a091"
+        "sha1:fcf8946fd56e64fa34d1a9cff53671e5ff89f3de",
+        "sha1:3a8cc3b5c2c2d1d1686c8a14a474d38686bab873"
     ],
     "bin": "bin\\file.exe"
 }
diff --git a/findutils.json b/findutils.json
index 02a7ee6b86..d287fad3ee 100644
--- a/findutils.json
+++ b/findutils.json
@@ -1,20 +1,21 @@
 {
-    "homepage": "http://www.mingw.org/wiki/msys",
     "version": "4.4.2",
-    "license": "GPL-2.0",
+    "description": "Basic file searching utilities.",
+    "homepage": "http://www.mingw.org/wiki/msys",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/findutils/findutils-4.4.2-2/findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/findutils/findutils-4.4.2-2/locate-4.4.2-2-msys-1.0.13-bin.tar.lzma"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/findutils/findutils-4.4.2-2/findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/findutils/findutils-4.4.2-2/locate-4.4.2-2-msys-1.0.13-bin.tar.lzma"
     ],
     "hash": [
-        "41c7d5561662e41da74951f373a08a95db40b27b1246227bbbc13abc44976ea7",
-        "b533de0ee04dc4d53ca745210e41eb9437044ebd367c001f3615092e7214a4a3",
-        "f13de6d2e3c428e7f9a7251c6b01d6f7569e20f7ac126c68c028eb5f542473bb",
-        "779e819b7942dc070c45f4cba633e6a9ae4bfe8b506a3541f4ce86ad0595726d",
-        "3fbb9826feae0698a58c8e1bbaa46caafb2bd07a63c59e33cd4478aee14ee147"
+        "sha1:fff020614bd796697739887c636f15a42b4b14aa",
+        "sha1:f4fd249ff5810b01fedc4a1dbdbe1b7d1e4cc619",
+        "sha1:2b64c42ac61c7ebd710333a6db2f35b21e4fccaf",
+        "sha1:fbdf7bae277f02f4189fa1d9ebf92fba6852dbce",
+        "sha1:7e5454e063f6b6adbc6278232afb5e54c80517d7"
     ],
     "bin": [
         "bin\\find.exe",
diff --git a/gawk.json b/gawk.json
index 11262f2198..d3223f5b32 100644
--- a/gawk.json
+++ b/gawk.json
@@ -1,7 +1,8 @@
 {
-    "homepage": "http://www.mingw.org/wiki/MSYS",
     "version": "3.1.7",
-    "license": "GPL-3.0",
+    "description": "Interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code.",
+    "homepage": "http://www.mingw.org/wiki/MSYS",
+    "license": "GPL-3.0-only",
     "url": [
         "https://sourceforge.net/projects/mingw/files/MSYS/Base/gawk/gawk-3.1.7-2/gawk-3.1.7-2-msys-1.0.13-bin.tar.lzma",
         "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma",
@@ -9,10 +10,10 @@
         "https://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma"
     ],
     "hash": [
-        "eb15478ea76e75b666ad7fc7049de21b9f487e0e1ea0e96d40953a477e91c3dd",
-        "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5",
-        "29db8c969661c511fbe2a341ab25c993c5f9c555842a75d6ddbcfa70dec16910",
-        "196921e8c232259c8e6a6852b9ee8d9ab2d29a91419f0c8dc27ba6f034231683"
+        "sha1:421ecc23e764ed87291796501189cc92fa905c0d",
+        "sha1:36d52ca7066eb6ad0da68c6f31214416f4c9dcec",
+        "sha1:4000b935a5bc30b4c757fde69d27716fa3c2c269",
+        "sha1:056d16bfb7a91c3e3b1acf8adb20edea6fceecdd"
     ],
     "bin": [
         "bin\\awk.exe",
diff --git a/grep.json b/grep.json
index 981d6069d8..8fd68270b7 100644
--- a/grep.json
+++ b/grep.json
@@ -1,14 +1,15 @@
 {
-    "homepage": "http://gnuwin32.sourceforge.net/packages/grep.htm",
     "version": "2.5.4",
-    "license": "GPL-2.0",
+    "description": "Print lines matching a pattern.",
+    "homepage": "http://gnuwin32.sourceforge.net/packages/grep.htm",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/gnuwin32/files/grep/2.5.4/grep-2.5.4-bin.zip",
-        "https://sourceforge.net/projects/gnuwin32/files/grep/2.5.4/grep-2.5.4-dep.zip"
+        "https://downloads.sourceforge.net/projects/gnuwin32/grep/2.5.4/grep-2.5.4-bin.zip",
+        "https://downloads.sourceforge.net/projects/gnuwin32/grep/2.5.4/grep-2.5.4-dep.zip"
     ],
     "hash": [
-        "3fd98201561b5af3f54a7dacc4f88068f5b5edf19ccdfc981c3c9fc60ff73519",
-        "2150e12da6631899842c28881a75889794d67b2bbc108341a26052f9bcb27584"
+        "sha1:56f41d351b3ed8ac671df4dd3bbd4c4d3b9190a2",
+        "sha1:6dc3a0d1a1751c731fb680a01650a1396c76648c"
     ],
     "bin": "bin\\grep.exe"
 }
diff --git a/gzip.json b/gzip.json
index 9a3466ea3d..86a621f13c 100644
--- a/gzip.json
+++ b/gzip.json
@@ -1,14 +1,15 @@
 {
-    "homepage": "http://www.mingw.org/wiki/msys",
     "version": "1.3.12",
-    "license": "GPL-2.0",
+    "description": "Popular data compression program.",
+    "homepage": "http://www.mingw.org/wiki/msys",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma"
     ],
     "hash": [
-        "ae0025264557c146044930e5085f1dffd479f2ff21492b1c2454efd689d287be",
-        "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5"
+        "sha1:a8954ccefa9732cd16b68e2fb50bfef281465c78",
+        "sha1:36d52ca7066eb6ad0da68c6f31214416f4c9dcec"
     ],
     "bin": "bin\\gzip.exe"
 }
diff --git a/iconv.json b/iconv.json
index bb689a98c5..bdf2abea44 100644
--- a/iconv.json
+++ b/iconv.json
@@ -1,24 +1,25 @@
 {
-    "homepage": "http://www.mingw.org/",
     "version": "1.14-3",
+    "description": "Convert characters from one code set to another.",
+    "homepage": "http://www.mingw.org/",
     "license": "GPL-3.0-or-later",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma"
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma"
     ],
     "hash": [
-        "540592b29a5964a566127d3e976f0c0df8ffc1137788030c17a44750e7b02340",
-        "fbdab03c19c6c50f15b58d02a3cb8c31e8d95baafaa67239f389b9023c7757fd",
-        "3c1daf9fade6342de5bb00aacdf85155eb04b07ee3ffe4b1c33b99692329391f",
-        "0dab5f923c5d289b8e7e22a3b16ebff5ff8b7c7c0d295ac71806d97ef87b8bee",
-        "d0cd8770aee5df0f3008f2d11383ed3b9c918902ba43ac20374b91fb37a4e58c",
-        "063e607c9a576a3ed62d3986f7263cff69cbb5f9e366b981ba36001c08c6a973",
-        "7fe1d9de26875386c1fbce1f9a971d43c45644b2df3ead2c5ff0042053b5b75d"
+        "sha1:ce3c2e774ff1717a7540b5a75ac87cf486bc1117",
+        "sha1:ec01ecc0c17e1222b2d49c58bda652529a4e3397",
+        "sha1:29345d047d444e3ebf407abd30051bea7078d711",
+        "sha1:4c5054a1d94521901d6f63516e7d6b33709b0806",
+        "sha1:d28a9a9465078b391e2e4c255daf156f7974bb1f",
+        "sha1:7ea04507b0fc1e8985249db4017c6beebf30339e",
+        "sha1:e2f6695555afd1b7e0859299ec54a4bcdd82f724"
     ],
     "bin": "bin\\iconv.exe"
 }
diff --git a/patch.json b/patch.json
index 938c505742..b14cd4fd57 100644
--- a/patch.json
+++ b/patch.json
@@ -1,13 +1,15 @@
 {
-    "homepage": "http://www.mingw.org/wiki/MSYS",
     "version": "2.6.1",
+    "description": "Apply diff to original.",
+    "homepage": "http://www.mingw.org/wiki/MSYS",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Extension/patch/patch-2.6.1-1/patch-2.6.1-1-msys-1.0.13-bin.tar.lzma"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/patch/patch-2.6.1-1/patch-2.6.1-1-msys-1.0.13-bin.tar.lzma"
     ],
     "hash": [
-        "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5",
-        "c8b7771304fb5e9fc33d8fca9045402f2e1bca055bf0b28127f3c3e85a254f67"
+        "sha1:36d52ca7066eb6ad0da68c6f31214416f4c9dcec",
+        "sha1:b4a82565f739f45dfa5ee3db8c59e9638833f89c"
     ],
     "bin": "bin\\patch.exe"
 }
diff --git a/png2jpeg.json b/png2jpeg.json
index 964f6e3735..2eff0a8cfc 100644
--- a/png2jpeg.json
+++ b/png2jpeg.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "http://passgenwin.sourceforge.net/abpage/projects.xhtml#png2jpeg",
-    "description": "png2jpeg is a simple command-line image converter from PNG to JPEG",
-    "license": "MIT",
     "version": "1.0.1.8",
+    "description": "Simple command-lineimage converter from PNG to JPEG.",
+    "homepage": "http://passgenwin.sourceforge.net/abpage/projects.xhtml#png2jpeg",
+    "license": "MIT",
     "architecture": {
         "64bit": {
             "url": "https://downloads.sourceforge.net/project/png2jpeg/win64/png2jpeg-1.0.1.8-win64.zip",
@@ -18,7 +18,7 @@
     "bin": "png2jpeg.exe",
     "checkver": {
         "url": "https://sourceforge.net/projects/png2jpeg/files/win64/",
-        "re": "png2jpeg-([\\d.]+)-win64.zip"
+        "regex": "png2jpeg-([\\d\\.]+)-win64\\.zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/pngcrush.json b/pngcrush.json
index 4a51aa4a82..209e75116c 100644
--- a/pngcrush.json
+++ b/pngcrush.json
@@ -1,6 +1,7 @@
 {
-    "homepage": "https://pmt.sourceforge.io/pngcrush/",
     "version": "1.8.11",
+    "description": "Optimizer for PNG (Portable Network Graphics) files.",
+    "homepage": "https://pmt.sourceforge.io/pngcrush/",
     "license": "libpng",
     "architecture": {
         "64bit": {
@@ -15,7 +16,7 @@
     "bin": "pngcrush.exe",
     "checkver": {
         "url": "https://sourceforge.net/projects/pmt/files/pngcrush-executables/",
-        "re": "title=\"([0-9\\.]+)\""
+        "regex": "title=\"([0-9\\.]+)\""
     },
     "autoupdate": {
         "architecture": {
diff --git a/sed.json b/sed.json
index f25d4f161d..62f8c9b1d7 100644
--- a/sed.json
+++ b/sed.json
@@ -1,14 +1,15 @@
 {
-    "homepage": "http://gnuwin32.sourceforge.net/packages/sed.htm",
     "version": "4.2.1",
-    "license": "GPL-2.0",
+    "description": "Stream editor.",
+    "homepage": "http://gnuwin32.sourceforge.net/packages/sed.htm",
+    "license": "GPL-2.0-only",
     "url": [
-        "https://sourceforge.net/projects/gnuwin32/files/sed/4.2.1/sed-4.2.1-bin.zip",
-        "https://sourceforge.net/projects/gnuwin32/files/sed/4.2.1/sed-4.2.1-dep.zip"
+        "https://downloads.sourceforge.net/projects/gnuwin32/sed/4.2.1/sed-4.2.1-bin.zip",
+        "https://downloads.sourceforge.net/projects/gnuwin32/sed/4.2.1/sed-4.2.1-dep.zip"
     ],
     "hash": [
-        "ae1651ffb461d69a7c51c76867a859d8addf802b85678834c0ebb402ef79b3cd",
-        "53e2e84db3e6c5855fd8013e1b79ccbd53b6bae7e7e4d59c0d18bb1dd5d18961"
+        "sha1:dfd3d1dae27a24784d7ab40eb074196509fa48fe",
+        "sha1:f7edbd7152d8720c95d46dd128b87b8ba48a5d6f"
     ],
     "bin": "bin\\sed.exe"
 }
diff --git a/tar.json b/tar.json
index b5c411c67c..be6ea937a4 100644
--- a/tar.json
+++ b/tar.json
@@ -1,21 +1,22 @@
 {
-    "homepage": "http://www.mingw.org/wiki/msys",
     "version": "1.23",
-    "license": "GPL-2.0",
+    "description": "File archiver for manipulation with '.tar.*' files.",
+    "homepage": "http://www.mingw.org/wiki/msys",
+    "license": "GPL-2.0-only",
     "depends": "gzip",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma"
     ],
     "hash": [
-        "2fa09e5a9563a9608077a65b276891c9f89de416dbe4b4a9eb4e8f36250a2887",
-        "4e262a414f238773b311c8bb55a52e62743c06e0e55b319ca5b47e3e306464d5",
-        "196921e8c232259c8e6a6852b9ee8d9ab2d29a91419f0c8dc27ba6f034231683",
-        "29db8c969661c511fbe2a341ab25c993c5f9c555842a75d6ddbcfa70dec16910",
-        "85dd8c1e27a90675c5f867be57ba7ae2bb55dde8cd2d19f284c896be134bd3d1"
+        "sha1:1791b71ad8573612049a8a4821d93e870fb2ae38",
+        "sha1:36d52ca7066eb6ad0da68c6f31214416f4c9dcec",
+        "sha1:056d16bfb7a91c3e3b1acf8adb20edea6fceecdd",
+        "sha1:4000b935a5bc30b4c757fde69d27716fa3c2c269",
+        "sha1:d95faa144cf06625b3932a8e84ed1a6ab6bbe644"
     ],
     "bin": "bin\\tar.exe"
 }
diff --git a/telnet.json b/telnet.json
index 7fa07ae288..2777cc1267 100644
--- a/telnet.json
+++ b/telnet.json
@@ -1,22 +1,23 @@
 {
+    "version": "msys-inetutils-1.7-1",
+    "description": "Telnet client.",
     "homepage": "http://www.mingw.org/wiki/msys",
     "license": "GPL-2.0",
-    "version": "msys-inetutils-1.7-1",
     "url": [
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Extension/minires/minires-1.02_1-2/libminires-1.02_1-2-msys-1.0.13-dll.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Extension/bison/bison-2.4.2-1/bison-2.4.2-1-msys-1.0.13-rtm.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys-1.0.13-bin.tar.lzma",
-        "https://sourceforge.net/projects/mingw/files/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys.RELEASE_NOTES.txt"
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/msys-core/msys-1.0.13-2/msysCORE-1.0.13-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/minires/minires-1.02_1-2/libminires-1.02_1-2-msys-1.0.13-dll.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/bison/bison-2.4.2-1/bison-2.4.2-1-msys-1.0.13-rtm.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys-1.0.13-bin.tar.lzma",
+        "https://downloads.sourceforge.net/projects/mingw/MSYS/Extension/inetutils/inetutils-1.7-1/inetutils-1.7-1-msys.RELEASE_NOTES.txt"
     ],
     "hash": [
-        "41c7d5561662e41da74951f373a08a95db40b27b1246227bbbc13abc44976ea7",
-        "906e756332b5fd6c10eeb4b6362f5957dd8cafa5679f89d9adbae59dff7f2ff2",
-        "e42fbdcff71404a76306f3b8f0024f453aafa7fe7dd9dac43c82b2e8d33e23f1",
-        "81cd516f5c8071edfb6004fb70424226245dca48651d20b7055d713085490263",
-        "cd2b56b9c8e424d8c3c86e2101069d4083ce1bb2f929591a70bdc4fb604ddb46",
-        "7d629340d7b7ddeccae662fbafdafb779dfb8013b27d8d2a7a75a5bf7529c5b7"
+        "sha1:fff020614bd796697739887c636f15a42b4b14aa",
+        "sha1:c8e450e6dd6109bbcee53cfe5379c49a7daf110a",
+        "sha1:3408f8d264ab106a3a3e189383020c7eb131390f",
+        "sha1:d5e567e57febc498234e739d7542bde2ba41bbc9",
+        "sha1:f7282056985406edeed7ee2618cdfff7dccbb6c5",
+        "sha1:087d2fb4bead980f55ad6a969a921004ab64cd79"
     ],
     "bin": "bin\\telnet.exe"
 }
diff --git a/which.json b/which.json
index 6ec43590aa..0377acf728 100644
--- a/which.json
+++ b/which.json
@@ -1,8 +1,13 @@
 {
-    "homepage": "http://gnuwin32.sourceforge.net/packages/which.htm",
     "version": "2.20",
-    "license": "GPL-2.0",
-    "url": "https://sourceforge.net/projects/gnuwin32/files/which/2.20/which-2.20-bin.zip",
-    "hash": "035ec15541649f75459fb81f02406c72e1129fc9041b308160938ae712a603a4",
-    "bin": "bin\\which.exe"
+    "description": "Show the full path of command.",
+    "homepage": "http://gnuwin32.sourceforge.net/packages/which.htm",
+    "license": "GPL-2.0-only",
+    "url": "https://downloads.sourceforge.net/projects/gnuwin32/which/2.20/which-2.20-bin.zip",
+    "hash": "sha1:385990045d755bb910d2c30b9697faf36d61e37e",
+    "bin": "bin\\which.exe",
+    "checkver": "(?smi)Version</a></h2>\\s+<p>([\\d\\.]+)",
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/projects/gnuwin32/which/$version/which-$version-bin.zip"
+    }
 }
diff --git a/xmlstarlet.json b/xmlstarlet.json
index 58207dd541..805895838f 100644
--- a/xmlstarlet.json
+++ b/xmlstarlet.json
@@ -1,18 +1,18 @@
 {
-    "autoupdate": {
-        "extract_dir": "xmlstarlet-$version",
-        "url": "https://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$version/xmlstarlet-$version-win32.zip"
-    },
-    "bin": "xml.exe",
-    "checkver": {
-        "re": "xmlstarlet-([\\d.]+)-win",
-        "url": "https://sourceforge.net/projects/xmlstar/files/"
-    },
-    "description": "Transform, query, validate, and edit XML files",
-    "extract_dir": "xmlstarlet-1.6.1",
-    "hash": "sha1:cc5f5cd17a1f81740e5185a70408ffd6fa2f862d",
+    "version": "1.6.1",
+    "description": "Transform, query, validate, and edit XML files.",
     "homepage": "http://xmlstar.sourceforge.net/",
     "license": "MIT",
     "url": "https://downloads.sourceforge.net/project/xmlstar/xmlstarlet/1.6.1/xmlstarlet-1.6.1-win32.zip",
-    "version": "1.6.1"
+    "hash": "sha1:cc5f5cd17a1f81740e5185a70408ffd6fa2f862d",
+    "extract_dir": "xmlstarlet-1.6.1",
+    "bin": "xml.exe",
+    "checkver": {
+        "url": "https://sourceforge.net/projects/xmlstar/files/",
+        "regex": "xmlstarlet-([\\d\\.]+)-win"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$version/xmlstarlet-$version-win32.zip",
+        "extract_dir": "xmlstarlet-$version"
+    }
 }