diff --git a/debian/changelog b/debian/changelog
index d584194..390f19b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shim-signed (1.31) UNRELEASED; urgency=medium
+
+  * update-secureboot-policy: fix error if /var/lib/dkms does not
+    exist. Closes: #923718
+
+ -- Steve McIntyre <93sam@debian.org>  Sat, 25 May 2019 02:25:24 +0100
+
 shim-signed (1.30) unstable; urgency=medium
 
   * Force the built-using version to be 15+1533136590.3beb971-6. That
diff --git a/update-secureboot-policy b/update-secureboot-policy
index 5e7b4a8..85fc27a 100755
--- a/update-secureboot-policy
+++ b/update-secureboot-policy
@@ -142,8 +142,9 @@ elif echo "$args" | grep -qc -- '--help'; then
 	exit 0
 fi
 
-if [ `find /var/lib/dkms -type d -print | wc -l ` -gt 1 ]; then
-	setup_mok_validation $enable_secureboot
+if [ -d /var/lib/dkms ] &&
+       [ `find /var/lib/dkms -type d -print | wc -l ` -gt 1 ]; then
+    setup_mok_validation $enable_secureboot
 else
 	echo "No DKMS packages installed: not changing Secure Boot validation state."
 fi