diff --git a/monitor.yml b/monitor.yml
index cede33f..47fcc5c 100644
--- a/monitor.yml
+++ b/monitor.yml
@@ -1,9 +1,14 @@
 - host:     srv01
   service:  hamburg.freifunk.net
-  exec:     curl hamburg.freifunk.net 2> /dev/null | grep -q "hamburg.freifunk.net | Initiative für freie Funknetzwerke in Hamburg"
+  http:
+    url:    http://hamburg.freifunk.net/
+    contains:   "hamburg.freifunk.net | Initiative für freie Funknetzwerke in Hamburg"
 - host:     srv01
   service:  formular.hamburg.freifunk.net
-  exec:     curl formular.hamburg.freifunk.net 2> /dev/null | grep -q "Knotenverwaltung"
+  http:
+    url:    http://formular.hamburg.freifunk.net/
+    contains:   "Knotenverwaltung"
 - host:     srv01
   service:  graph.hamburg.freifunk.net
-  exec:     curl http://graph.hamburg.freifunk.net/graph_compiled.js 2> /dev/null > /dev/null
+  http:
+    url:    http://graph.hamburg.freifunk.net/graph_compiled.js