diff --git a/tools/make_unicode b/tools/make_unicode
index 27ce80432a8..da4c732bc3e 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -643,7 +643,14 @@ sub load_data()
 
         $category_table[$src] = $categories{$cat};
         $direction_table[$src] = $bidi;
-        $joining_table[$src] = $joining_types{"T"} if $cat eq "Mn" || $cat eq "Me" || $cat eq "Cf";
+        if ($cat eq "Mn" || $cat eq "Me" || $cat eq "Cf")
+        {
+            $joining_table[$src] = $joining_types{"T"};
+        }
+        else
+        {
+            $joining_table[$src] = $joining_types{"U"};
+        }
 
         if ($lower ne "")
         {