diff --git a/rowbot b/rowbot
index fdc16b9..468b10b 100755
--- a/rowbot
+++ b/rowbot
@@ -772,6 +772,35 @@ on_msg_PRIVMSG_nolog() {
   fi
 }
 
+# debugger
+
+debugger_toggle() {
+  if [[ $- = *x* ]]; then
+    irc_privmsg "${msg[to]}" "disabling debug mode"
+    set +x
+  else
+    irc_privmsg "${msg[to]}" "enabling debug mode"
+    set -x
+  fi
+}
+
+on_init_debugger() {
+  plugin_reg debug debugger_toggle
+}
+
+on_before_debugger() {
+  if [[ $- = *x* ]]; then
+    export SET_X=yes
+  fi
+}
+
+on_after_debugger() {
+  if [[ -v SET_X && $SET_X = yes ]]; then
+    set -x
+    unset SET_X
+  fi
+}
+
 ###
 # cleanup
 ###