diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c
index 074f30fcbe0..4344c1480c6 100644
--- a/dlls/dwrite/bracket.c
+++ b/dlls/dwrite/bracket.c
@@ -1,5 +1,5 @@
 /* Unicode Bidirectional Bracket table */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiBrackets.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:BidiBrackets.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c
index 07266eae29f..2516b66bd4f 100644
--- a/dlls/dwrite/linebreak.c
+++ b/dlls/dwrite/linebreak.c
@@ -1,5 +1,5 @@
 /* Unicode Line Break Properties */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/LineBreak.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:LineBreak.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c
index 71a0b44e11f..acdffbe171e 100644
--- a/dlls/dwrite/mirror.c
+++ b/dlls/dwrite/mirror.c
@@ -1,5 +1,5 @@
 /* Unicode BiDi mirroring */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiMirroring.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:BidiMirroring.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c
index 8c8d49a2aed..1710b8cabc8 100644
--- a/dlls/dwrite/scripts.c
+++ b/dlls/dwrite/scripts.c
@@ -1,5 +1,5 @@
 /* Unicode Script IDs */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/Scripts.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:Scripts.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h
index 37b678c9db6..887e3b7fec2 100644
--- a/dlls/dwrite/scripts.h
+++ b/dlls/dwrite/scripts.h
@@ -1,5 +1,5 @@
 /* Unicode Script IDs */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/Scripts.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:Scripts.txt */
 /* DO NOT EDIT!! */
 
 enum unicode_script_id {
diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c
index b19f8472375..90314cf87a2 100644
--- a/dlls/gdi32/vertical.c
+++ b/dlls/gdi32/vertical.c
@@ -1,5 +1,5 @@
 /* Unicode Vertical Orientation */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/VerticalOrientation.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:VerticalOrientation.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/kernelbase/compose.c b/dlls/kernelbase/compose.c
index 7ac9445007e..4a23b5a92d9 100644
--- a/dlls/kernelbase/compose.c
+++ b/dlls/kernelbase/compose.c
@@ -1,5 +1,5 @@
 /* Unicode char composition */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/kernelbase/decompose.c b/dlls/kernelbase/decompose.c
index 4312e562ee4..8c09dd5526d 100644
--- a/dlls/kernelbase/decompose.c
+++ b/dlls/kernelbase/decompose.c
@@ -1,5 +1,5 @@
 /* Unicode char composition */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/kernelbase/digitmap.c b/dlls/kernelbase/digitmap.c
index 3986e9f285a..57145243eeb 100644
--- a/dlls/kernelbase/digitmap.c
+++ b/dlls/kernelbase/digitmap.c
@@ -1,5 +1,5 @@
 /* Unicode digit folding mappings */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/ntdll/combclass.c b/dlls/ntdll/combclass.c
index 055fd287537..188c6774e5c 100644
--- a/dlls/ntdll/combclass.c
+++ b/dlls/ntdll/combclass.c
@@ -1,5 +1,5 @@
 /* Unicode Combining Classes */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c
index 074f30fcbe0..4344c1480c6 100644
--- a/dlls/usp10/bracket.c
+++ b/dlls/usp10/bracket.c
@@ -1,5 +1,5 @@
 /* Unicode Bidirectional Bracket table */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiBrackets.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:BidiBrackets.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c
index 1821ef486e4..8a25afd4bc9 100644
--- a/dlls/usp10/indicsyllable.c
+++ b/dlls/usp10/indicsyllable.c
@@ -1,6 +1,6 @@
 /* Unicode Indic Syllabic Category */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/IndicSyllabicCategory.txt */
-/*       and from http://www.unicode.org/Public/12.1.0/ucd/IndicPositionalCategory.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:IndicSyllabicCategory.txt */
+/*       and from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:IndicPositionalCategory.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c
index 07266eae29f..2516b66bd4f 100644
--- a/dlls/usp10/linebreak.c
+++ b/dlls/usp10/linebreak.c
@@ -1,5 +1,5 @@
 /* Unicode Line Break Properties */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/LineBreak.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:LineBreak.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/usp10/mirror.c b/dlls/usp10/mirror.c
index 71a0b44e11f..acdffbe171e 100644
--- a/dlls/usp10/mirror.c
+++ b/dlls/usp10/mirror.c
@@ -1,5 +1,5 @@
 /* Unicode BiDi mirroring */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiMirroring.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:BidiMirroring.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c
index c5e81b7bfef..73b056a7c3e 100644
--- a/dlls/usp10/shaping.c
+++ b/dlls/usp10/shaping.c
@@ -1,5 +1,5 @@
 /* Unicode Arabic shaping */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/ArabicShaping.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:ArabicShaping.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c
index b19f8472375..90314cf87a2 100644
--- a/dlls/wineps.drv/vertical.c
+++ b/dlls/wineps.drv/vertical.c
@@ -1,5 +1,5 @@
 /* Unicode Vertical Orientation */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/VerticalOrientation.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:VerticalOrientation.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/libs/port/casemap.c b/libs/port/casemap.c
index 02111a24be2..bd69a662502 100644
--- a/libs/port/casemap.c
+++ b/libs/port/casemap.c
@@ -1,5 +1,5 @@
 /* Unicode case mappings */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/libs/port/compose.c b/libs/port/compose.c
index 7ac9445007e..4a23b5a92d9 100644
--- a/libs/port/compose.c
+++ b/libs/port/compose.c
@@ -1,5 +1,5 @@
 /* Unicode char composition */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/libs/port/decompose.c b/libs/port/decompose.c
index 5027a87bad5..fb8e90a7ceb 100644
--- a/libs/port/decompose.c
+++ b/libs/port/decompose.c
@@ -1,5 +1,5 @@
 /* Unicode char composition */
-/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */
+/* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
 #include "windef.h"
diff --git a/tools/make_unicode b/tools/make_unicode
index a7181e06e84..d425d934f44 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -23,7 +23,7 @@ use strict;
 
 # base URLs for www.unicode.org files
 my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS";
-my $UNIDATA = "http://www.unicode.org/Public/12.1.0/ucd";
+my $UNIDATA = "http://www.unicode.org/Public/12.1.0/ucd/UCD.zip";
 my $REPORTS = "http://www.unicode.org/reports";
 my $RFCS = "http://www.rfc-editor.org/rfc";
 
@@ -444,9 +444,22 @@ sub open_data_file($$)
     local *FILE;
     unless (-f "data/$name")
     {
-        print "Fetching $base/$name...\n";
         system "mkdir", "-p", $dir;
-        !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name";
+        if ($base =~ /.*\/([^\/]+\.zip)$/)
+        {
+            my $zip = $1;
+            unless (-f "data/$zip")
+            {
+                print "Fetching $base...\n";
+                !system "wget", "-q", "-O", "data/$zip", "$base" or die "cannot fetch $base";
+            }
+            !system "unzip", "-q", "-d", "data", "data/$zip", $name or die "cannot extract $name from $zip";
+        }
+        else
+        {
+            print "Fetching $base/$name...\n";
+            !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name";
+        }
     }
     open FILE, "<data/$name" or die "cannot open data/$name";
     return *FILE;
@@ -1333,8 +1346,8 @@ sub dump_indic($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Indic Syllabic Category */\n";
-    print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n";
-    print OUTPUT "/*       and from $UNIDATA/IndicPositionalCategory.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:IndicSyllabicCategory.txt */\n";
+    print OUTPUT "/*       and from $UNIDATA:IndicPositionalCategory.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1399,7 +1412,7 @@ sub dump_linebreak($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Line Break Properties */\n";
-    print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:LineBreak.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1616,7 +1629,7 @@ sub dump_scripts($)
     open OUTPUT,">$header.new" or die "Cannot create $header";
     print "Building $header\n";
     print OUTPUT "/* Unicode Script IDs */\n";
-    print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:Scripts.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
 
     print OUTPUT "enum unicode_script_id {\n";
@@ -1634,7 +1647,7 @@ sub dump_scripts($)
     open OUTPUT,">$filename.new" or die "Cannot create $header";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Script IDs */\n";
-    print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:Scripts.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1668,7 +1681,7 @@ sub dump_mirroring($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode BiDi mirroring */\n";
-    print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:BidiMirroring.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
     dump_two_level_mapping( "wine_mirror_map", 0, 16, @mirror_table );
@@ -1705,7 +1718,7 @@ sub dump_bracket($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Bidirectional Bracket table */\n";
-    print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:BidiBrackets.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1746,7 +1759,7 @@ sub dump_shaping($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Arabic shaping */\n";
-    print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:ArabicShaping.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1807,7 +1820,7 @@ sub dump_vertical($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Vertical Orientation */\n";
-    print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:VerticalOrientation.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1825,7 +1838,7 @@ sub dump_digit_folding($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode digit folding mappings */\n";
-    print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -1843,7 +1856,7 @@ sub dump_case_mappings($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode case mappings */\n";
-    print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -2299,7 +2312,7 @@ sub dump_compose_table($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode char composition */\n";
-    print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";
 
@@ -2484,7 +2497,7 @@ sub dump_decompose_table($$)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode char composition */\n";
-    print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n";
 
@@ -2504,7 +2517,7 @@ sub dump_combining_class($)
     open OUTPUT,">$filename.new" or die "Cannot create $filename";
     print "Building $filename\n";
     print OUTPUT "/* Unicode Combining Classes */\n";
-    print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n";
+    print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n";
     print OUTPUT "/* DO NOT EDIT!! */\n\n";
     print OUTPUT "#include \"windef.h\"\n\n";