diff --git a/bin/ipmi_debug.py b/bin/ipmi_debug.py
index 43dbcbd..300756c 100755
--- a/bin/ipmi_debug.py
+++ b/bin/ipmi_debug.py
@@ -69,7 +69,7 @@
 
 def main():
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-    bus = dbus.SessionBus()
+    bus = dbus.SystemBus()
     name = dbus.service.BusName(DBUS_NAME, bus)
     obj = IpmiDebug(bus, OBJ_NAME)
     mainloop = gobject.MainLoop()
diff --git a/bin/ipmi_example.py b/bin/ipmi_example.py
index bc506fa..965332c 100755
--- a/bin/ipmi_example.py
+++ b/bin/ipmi_example.py
@@ -104,11 +104,14 @@
 		for i in status:
 			print i+" = "+status[i]
 	elif (cmd == "pokewatchdog"):
-		intf = self.getWatchdog()
+		intf = getWatchdog()
 		intf.poke()
 	elif (cmd == "statewatchdog"):
-		intf = self.getWatchdog()
+		intf = getWatchdog()
 		intf.start()
+	elif (cmd == "setwatchdog"):
+		count = int(sys.argv[2])
+		intf.set(count)
 	else:
 		print "Unsupported command"