diff --git a/bundles/wol-sleeper/files/suspend_if_idle b/bundles/wol-sleeper/files/suspend_if_idle
index 50a6374..0bc8480 100644
--- a/bundles/wol-sleeper/files/suspend_if_idle
+++ b/bundles/wol-sleeper/files/suspend_if_idle
@@ -77,6 +77,7 @@ else
   done
 
   echo "SESPENDING"
+  downtime
   systemctl suspend
   exit 0
 fi
diff --git a/bundles/wol-sleeper/metadata.py b/bundles/wol-sleeper/metadata.py
index b7a946c..371174f 100644
--- a/bundles/wol-sleeper/metadata.py
+++ b/bundles/wol-sleeper/metadata.py
@@ -9,6 +9,27 @@ defaults = {
             'net-tools': {},
         },
     },
+    'systemd': {
+        'units': {
+            'wakeonlan-remove-downtime.service': {
+                'Unit': {
+                    'Description': 'remove icinga downtime after wakeup',
+                    'After': {
+                        'network.target',
+                        'suspend.target',
+                    },
+                },
+                'Service': {
+                    'ExecStart': '/usr/local/bin/downtime remove',
+                },
+                'Install': {
+                    'WantedBy': {
+                        'suspend.target',
+                    },
+                },
+            },
+        },
+    },
 }