diff -Nru zoneminder-1.32.3/debian/changelog zoneminder-1.32.3/debian/changelog
--- zoneminder-1.32.3/debian/changelog	2020-02-25 13:22:20.000000000 +0000
+++ zoneminder-1.32.3/debian/changelog	2020-02-25 16:57:29.000000000 +0000
@@ -1,3 +1,13 @@
+zoneminder (1.32.3-2ubuntu2) focal; urgency=medium
+
+  * d/p/mysql8-replace-password-call.patch: updated to also include
+    the password() call in zm_create.sql.in which was previously
+    incorrectly patched in the (now removed) mysql8-password-deprecated.patch
+    patch. Thanks to Joseph Yasi <joe.yasi@gmail.com>.
+  * d/README.Debian: remove syntax error in the new mysql8 instructions
+
+ -- Andreas Hasenack <andreas@canonical.com>  Tue, 25 Feb 2020 13:57:29 -0300
+
 zoneminder (1.32.3-2ubuntu1) focal; urgency=medium
 
   * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
diff -Nru zoneminder-1.32.3/debian/patches/mysql8-password-deprecated.patch zoneminder-1.32.3/debian/patches/mysql8-password-deprecated.patch
--- zoneminder-1.32.3/debian/patches/mysql8-password-deprecated.patch	2020-02-24 17:57:34.000000000 +0000
+++ zoneminder-1.32.3/debian/patches/mysql8-password-deprecated.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From 5b896b5e5ca57fe9780e852d570a31c7a5b2ecfb Mon Sep 17 00:00:00 2001
-From: Isaac Connor <isaac@zoneminder.com>
-Date: Mon, 8 Jul 2019 14:16:57 -0400
-Subject: [PATCH] Replace password('admin') with the resulting string because
- use of password is deprecated
-
----
- db/zm_create.sql.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Origin: https://github.com/ZoneMinder/zoneminder/commit/5b896b5e5ca57fe9780e852d570a31c7a5b2ecfb
-Bug: https://github.com/ZoneMinder/zoneminder/issues/2658
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
-Last-Updated: 2020-02-21
-
---- a/db/zm_create.sql.in
-+++ b/db/zm_create.sql.in
-@@ -738,7 +738,7 @@
- --
- -- Create a default admin user.
- --
--insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');
-+insert into Users VALUES (NULL,'admin','$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6','',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');
- 
- --
- -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
diff -Nru zoneminder-1.32.3/debian/patches/mysql8-replace-password-call.patch zoneminder-1.32.3/debian/patches/mysql8-replace-password-call.patch
--- zoneminder-1.32.3/debian/patches/mysql8-replace-password-call.patch	2020-02-24 19:49:43.000000000 +0000
+++ zoneminder-1.32.3/debian/patches/mysql8-replace-password-call.patch	2020-02-25 16:22:52.000000000 +0000
@@ -56,3 +56,14 @@
      }
      $sql_values = array($username, $password);
    } else {
+--- a/db/zm_create.sql.in
++++ b/db/zm_create.sql.in
+@@ -738,7 +738,7 @@
+ --
+ -- Create a default admin user.
+ --
+-insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');
++insert into Users VALUES (NULL,'admin',CONCAT('*',UPPER(SHA1(UNHEX(SHA1('admin'))))),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');
+ 
+ --
+ -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
diff -Nru zoneminder-1.32.3/debian/patches/series zoneminder-1.32.3/debian/patches/series
--- zoneminder-1.32.3/debian/patches/series	2020-02-24 19:49:43.000000000 +0000
+++ zoneminder-1.32.3/debian/patches/series	2020-02-25 16:23:12.000000000 +0000
@@ -26,6 +26,5 @@
 0010-Use-mootools-shipped-by-debian-rather-than-the-zonem.patch
 include_path.patch
 mysql8_my_bool.patch
-mysql8-password-deprecated.patch
 mysql8-reserved-keywords.patch
 mysql8-replace-password-call.patch
diff -Nru zoneminder-1.32.3/debian/README.Debian zoneminder-1.32.3/debian/README.Debian
--- zoneminder-1.32.3/debian/README.Debian	2020-02-24 23:03:52.000000000 +0000
+++ zoneminder-1.32.3/debian/README.Debian	2020-02-25 16:57:21.000000000 +0000
@@ -14,9 +14,9 @@
 With MySQL8:
 
     echo "CREATE USER 'zmuser'@'localhost' IDENTIFIED WITH mysql_native_password BY 'zmpass';"\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf
     echo 'grant lock tables,alter,create,select,insert,update,delete,index on zm.* to 'zmuser'@localhost;'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf
 
 Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
 accordingly.