diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e782bf0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,9 @@
+UCD:=16.0.0
+
+tables:
+	yeslogic-ucd-generate canonical-combining-class --rust-enum ../ucd-generate/ucd-$(UCD) > src/tables.rs
+	cargo fmt
+
+
+.PHONY: tables
+
diff --git a/README.md b/README.md
index aeb8cb7..48225a6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 unicode-canonical-combining-class
-====================
+=================================
 
 <div align="center">
   <a href="https://github.com/yeslogic/unicode-canonical-combining-class/actions/workflows/ci.yml">
@@ -10,7 +10,7 @@ unicode-canonical-combining-class
   <a href="https://crates.io/crates/unicode-canonical-combining-class">
     <img src="https://img.shields.io/crates/v/unicode-canonical-combining-class.svg" alt="Version">
   </a>
-  <img src="https://img.shields.io/badge/unicode-15.0-informational" alt="Unicode Version">
+  <img src="https://img.shields.io/badge/unicode-16.0-informational" alt="Unicode Version">
   <a href="https://github.com/yeslogic/unicode-canonical-combining-class/blob/master/LICENSE">
     <img src="https://img.shields.io/crates/l/unicode-canonical-combining-class.svg" alt="License">
   </a>
@@ -19,7 +19,7 @@ unicode-canonical-combining-class
 <br>
 
 Fast lookup of the Unicode Canonical Combining Class property for `char`
-in Rust using Unicode 15.0 data. This crate is no-std compatible.
+in Rust using Unicode 16.0 data. This crate is no-std compatible.
 
 Usage
 -----
diff --git a/src/lib.rs b/src/lib.rs
index 9e09053..8d15c76 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@ pub use tables::CanonicalCombiningClass;
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that this version of unicode-joining-type was generated from.
-pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0);
+pub const UNICODE_VERSION: (u64, u64, u64) = (16, 0, 0);
 
 #[cfg(test)]
 mod test {
diff --git a/src/tables.rs b/src/tables.rs
index abb2154..2d9c1a7 100644
--- a/src/tables.rs
+++ b/src/tables.rs
@@ -1,10 +1,10 @@
 // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
 //
-//   yeslogic-ucd-generate canonical-combining-class --rust-enum ../ucd-generate/ucd-15.0.0
+//   yeslogic-ucd-generate canonical-combining-class --rust-enum ../ucd-generate/ucd-16.0.0
 //
-// Unicode version: 15.0.0.
+// Unicode version: 16.0.0.
 //
-// yeslogic-ucd-generate 0.6.0 is available on crates.io.
+// yeslogic-ucd-generate 0.7.0 is available on crates.io.
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
 pub enum CanonicalCombiningClass {
@@ -212,8 +212,8 @@ pub const CANONICAL_COMBINING_CLASS: &'static [(u32, u32, CanonicalCombiningClas
     (2089, 2093, CanonicalCombiningClass::Above),
     (2094, 2136, CanonicalCombiningClass::NotReordered),
     (2137, 2139, CanonicalCombiningClass::Below),
-    (2140, 2199, CanonicalCombiningClass::NotReordered),
-    (2200, 2200, CanonicalCombiningClass::Above),
+    (2140, 2198, CanonicalCombiningClass::NotReordered),
+    (2199, 2200, CanonicalCombiningClass::Above),
     (2201, 2203, CanonicalCombiningClass::Below),
     (2204, 2207, CanonicalCombiningClass::Above),
     (2208, 2249, CanonicalCombiningClass::NotReordered),
@@ -506,7 +506,9 @@ pub const CANONICAL_COMBINING_CLASS: &'static [(u32, u32, CanonicalCombiningClas
     (68326, 68326, CanonicalCombiningClass::Below),
     (68327, 68899, CanonicalCombiningClass::NotReordered),
     (68900, 68903, CanonicalCombiningClass::Above),
-    (68904, 69290, CanonicalCombiningClass::NotReordered),
+    (68904, 68968, CanonicalCombiningClass::NotReordered),
+    (68969, 68973, CanonicalCombiningClass::Above),
+    (68974, 69290, CanonicalCombiningClass::NotReordered),
     (69291, 69292, CanonicalCombiningClass::Above),
     (69293, 69372, CanonicalCombiningClass::NotReordered),
     (69373, 69375, CanonicalCombiningClass::Below),
@@ -554,7 +556,9 @@ pub const CANONICAL_COMBINING_CLASS: &'static [(u32, u32, CanonicalCombiningClas
     (70502, 70508, CanonicalCombiningClass::Above),
     (70509, 70511, CanonicalCombiningClass::NotReordered),
     (70512, 70516, CanonicalCombiningClass::Above),
-    (70517, 70721, CanonicalCombiningClass::NotReordered),
+    (70517, 70605, CanonicalCombiningClass::NotReordered),
+    (70606, 70608, CanonicalCombiningClass::Virama),
+    (70609, 70721, CanonicalCombiningClass::NotReordered),
     (70722, 70722, CanonicalCombiningClass::Virama),
     (70723, 70725, CanonicalCombiningClass::NotReordered),
     (70726, 70726, CanonicalCombiningClass::Nukta),
@@ -598,7 +602,9 @@ pub const CANONICAL_COMBINING_CLASS: &'static [(u32, u32, CanonicalCombiningClas
     (73111, 73111, CanonicalCombiningClass::Virama),
     (73112, 73536, CanonicalCombiningClass::NotReordered),
     (73537, 73538, CanonicalCombiningClass::Virama),
-    (73539, 92911, CanonicalCombiningClass::NotReordered),
+    (73539, 90414, CanonicalCombiningClass::NotReordered),
+    (90415, 90415, CanonicalCombiningClass::Virama),
+    (90416, 92911, CanonicalCombiningClass::NotReordered),
     (92912, 92916, CanonicalCombiningClass::Overlay),
     (92917, 92975, CanonicalCombiningClass::NotReordered),
     (92976, 92982, CanonicalCombiningClass::Above),
@@ -643,7 +649,10 @@ pub const CANONICAL_COMBINING_CLASS: &'static [(u32, u32, CanonicalCombiningClas
     (124140, 124141, CanonicalCombiningClass::AboveRight),
     (124142, 124142, CanonicalCombiningClass::Below),
     (124143, 124143, CanonicalCombiningClass::Above),
-    (124144, 125135, CanonicalCombiningClass::NotReordered),
+    (124144, 124397, CanonicalCombiningClass::NotReordered),
+    (124398, 124398, CanonicalCombiningClass::Above),
+    (124399, 124399, CanonicalCombiningClass::Below),
+    (124400, 125135, CanonicalCombiningClass::NotReordered),
     (125136, 125142, CanonicalCombiningClass::Below),
     (125143, 125251, CanonicalCombiningClass::NotReordered),
     (125252, 125257, CanonicalCombiningClass::Above),