diff --git a/debian/changelog b/debian/changelog
index bce178c37..47b3ba54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
 grub2 (2.02~beta2-36) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Use HTTPS for Vcs-Git URL.
 
+  [ Martin Pitt ]
+  * debian/postinst.in, debian/kernel/zz-update-grub: Call
+    systemd-detect-virt (which works under any init system, despite the
+    name) instead of the Ubuntu specific running-in-container wrapper.
+    (LP: #1539016)
+
  -- Colin Watson <cjwatson@debian.org>  Wed, 27 Jan 2016 11:51:12 +0000
 
 grub2 (2.02~beta2-35) unstable; urgency=medium
diff --git a/debian/kernel/zz-update-grub b/debian/kernel/zz-update-grub
index c039f8a68..5ed065fb1 100755
--- a/debian/kernel/zz-update-grub
+++ b/debian/kernel/zz-update-grub
@@ -3,8 +3,8 @@ set -e
 
 which update-grub >/dev/null 2>&1 || exit 0
 
-if type running-in-container >/dev/null 2>&1 && \
-   running-in-container >/dev/null; then
+if type systemd-detect-virt >/dev/null 2>&1 &&
+   systemd-detect-virt --quiet --container; then
 	exit 0
 fi
 
diff --git a/debian/postinst.in b/debian/postinst.in
index f8a0ba4e4..e3393a4df 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -296,7 +296,7 @@ config_item()
 
 running_in_container()
 {
-  type running-in-container >/dev/null 2>&1 && running-in-container >/dev/null
+  type systemd-detect-virt >/dev/null 2>&1 && systemd-detect-virt --quiet --container
 }
 
 run_grub_install()