diff --git a/debian/changelog b/debian/changelog
index 3b7ca2d5..bacfde88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mosquitto (1.5.5-1) unstable; urgency=medium
+
+  * SECURITY UPDATE: If the option `per_listener_settings` was set to true,
+    and the default listener was in use, and the default listener specified an
+    `acl_file`, then the acl file was being ignored. This affects version 1.5
+    to 1.5.4 inclusive.
+  * New upstream release.
+
+ -- Roger A. Light <roger@atchoo.org>  Tue, 11 Dec 2018 16:37:32 +0000
+
 mosquitto (1.5.4-2) unstable; urgency=medium
 
   * debian/patches/914525.patch : Use pkg-config to get systemd libs
diff --git a/debian/patches/914525.patch b/debian/patches/914525.patch
index 532efc9e..4dd6df99 100644
--- a/debian/patches/914525.patch
+++ b/debian/patches/914525.patch
@@ -3,7 +3,7 @@ Author: Roger Light <roger@atchoo.org>
 Forwarded: yes
 --- a/config.mk
 +++ b/config.mk
-@@ -235,8 +235,10 @@
+@@ -241,8 +241,10 @@
  endif
  
  ifeq ($(WITH_SYSTEMD),yes)