diff --git a/post-install.d/10-qubes-core-agent-features.sh b/post-install.d/10-qubes-core-agent-features.sh
index 491c334..69388c0 100755
--- a/post-install.d/10-qubes-core-agent-features.sh
+++ b/post-install.d/10-qubes-core-agent-features.sh
@@ -7,3 +7,9 @@ qvm-features-request qrexec=1
 if [ -x /usr/bin/qubes-gui ]; then
     qvm-features-request gui=1
 fi
+
+if systemctl -q is-enabled qubes-firewall.service 2>/dev/null; then
+    qvm-features-request qubes-firewall=1
+else
+    qvm-features-request qubes-firewall=0
+fi