diff --git a/cdist/conf/type/__iptables_apply/gencode-remote b/cdist/conf/type/__iptables_apply/gencode-remote
index 0773b452..9cdf28cf 100644
--- a/cdist/conf/type/__iptables_apply/gencode-remote
+++ b/cdist/conf/type/__iptables_apply/gencode-remote
@@ -1,2 +1,3 @@
-# Rebuild rules - FIXME: do conditionally as soon as cdist supports it
-echo /etc/init.d/iptables restart
+if grep -q "^__file/etc/iptables.d/" "$__messages_in"; then
+    echo /etc/init.d/iptables restart
+fi