diff --git a/debian/control b/debian/control
index 3c797305..8c2d8e91 100644
--- a/debian/control
+++ b/debian/control
@@ -167,8 +167,9 @@ Description: enhances misc security settings
  .
  user restrictions:
  .
-  * remount `/home`, `/tmp`, `/dev/shm` and `/run` with `nosuid,nodev`
- (default) and `noexec` (opt-in). To disable this, run
+  * remount various directories with stricter mount options
+  (`nosuid`, `nodev` or `noexec`). `noexec` on some directories
+  is opt-in. To disable this, run
  `sudo touch /etc/remount-disable`. To opt-in `noexec`, run
  `sudo touch /etc/noexec` and reboot (easiest).
  Alternatively file `/usr/local/etc/remount-disable` or file
diff --git a/lib/systemd/system/remount-secure.service b/lib/systemd/system/remount-secure.service
index 92509120..ca9e673f 100644
--- a/lib/systemd/system/remount-secure.service
+++ b/lib/systemd/system/remount-secure.service
@@ -2,7 +2,7 @@
 ## See the file COPYING for copying conditions.
 
 [Unit]
-Description=remount /home /tmp /dev/shm /run with nosuid,nodev (default) and noexec (opt-in)
+Description=remount various directories with stricter mount options
 Documentation=https://github.com/Whonix/security-misc
 
 DefaultDependencies=no
diff --git a/usr/lib/security-misc/remount-secure b/usr/lib/security-misc/remount-secure
index 84cd9090..a0783e5f 100755
--- a/usr/lib/security-misc/remount-secure
+++ b/usr/lib/security-misc/remount-secure
@@ -93,7 +93,7 @@ _home() {
 
 _run() {
    ## https://lists.freedesktop.org/archives/systemd-devel/2015-February/028456.html
-   new_mount_options="nosuid,nodev${noexec_maybe}"
+   new_mount_options="nosuid,nodev,noexec"
    remount_secure "$@"
 }
 
@@ -107,6 +107,37 @@ _tmp() {
    remount_secure "$@"
 }
 
+_etc() {
+   # noexec here breaks LightDM.
+   new_mount_options="nosuid,nodev"
+   remount_secure "$@"
+}
+
+_usr() {
+   new_mount_options="nodev"
+   remount_secure "$@"
+}
+
+_bin() {
+   new_mount_options="nodev"
+   remount_secure "$@"
+}
+
+_sbin() {
+   new_mount_options="nodev"
+   remount_secure "$@"
+}
+
+_var() {
+   new_mount_options="nosuid,nodev${noexec_maybe}"
+   remount_secure "$@"
+}
+
+_boot() {
+   new_mount_options="nosuid,nodev,noexec"
+   remount_secure "$@"
+}
+
 ## https://forums.whonix.org/t/re-mount-home-and-other-with-noexec-and-nosuid-among-other-useful-mount-options-for-better-security/7707/25
 # _lib() {
 #    ## Not using noexec on /lib.
@@ -123,6 +154,12 @@ main() {
    _run "$@"
    _dev_shm "$@"
    _tmp "$@"
+   _etc "$@"
+   _usr "$@"
+   _bin "$@"
+   _sbin "$@"
+   _var "$@"
+   _boot "$@"
    #_lib "$@"
    end "$@"
 }