diff --git a/debian/changelog b/debian/changelog
index 4d388c9..e5fca29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grub2 (2.04-1ubuntu26.2) UNRELEASED; urgency=medium
+
+  * When upgrading non-interactively, and grub-pc installation fails on to
+    the configured devices abort the package upgrade. This should prevent
+    missmatch between the grub core installed on the boot device and the
+    grub modules unpacked. Missmatch between core and modules may lead to
+    unpredictable results and boot failures. LP: #1889556
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 Jul 2020 15:19:17 +0100
+
 grub2 (2.04-1ubuntu26.1) focal; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/debian/postinst.in b/debian/postinst.in
index 4e1dafa..d0e68ae 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -658,7 +658,7 @@ case "$1" in
                     continue
                   fi
                 else
-                  break # noninteractive
+                  exit 1 # noninteractive
                 fi
               fi
             fi