diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index b63d6854460..78355307424 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -1379,7 +1379,7 @@ CREATE TABLE Reports (
 
 CREATE TABLE `Tags` (
   `Id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `Name` varchar(64) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+  `Name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `CreateDate` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
   `CreatedBy` int(10) unsigned,
   `LastAssignedDate` dateTime,
diff --git a/db/zm_update-1.39.6.sql b/db/zm_update-1.39.6.sql
new file mode 100644
index 00000000000..0d02f88717a
--- /dev/null
+++ b/db/zm_update-1.39.6.sql
@@ -0,0 +1,6 @@
+--
+-- This updates a 1.39.5 database to 1.39.6
+--
+-- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_bin
+--
+ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) CHARACTER SET `utf8mb4` COLLATE `utf8mb4_bin` NOT NULL DEFAULT '';
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 03b9a5e751c..c56e2077b47 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -21,7 +21,7 @@
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
 Name: zoneminder
-Version: 1.39.5
+Version: 1.39.6
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons