diff --git a/rowbot b/rowbot
index 15eee05..c8ea8e2 100755
--- a/rowbot
+++ b/rowbot
@@ -266,6 +266,19 @@ config-reload() {
     exec {log_fd}>&-
     exec {log_fd}>"$log"
   fi
+
+  reload_vars=(
+    nick ident host level log log_fd alarm_pid tls_pid in_sock
+    out_sock sock_dir sys_root fact_root dev trigger registered
+    keep_trying desired_nick
+  )
+
+  for env_var in "${reload_vars[@]}"; do
+    export "${env_var^^}"="${!env_var}"
+  done
+
+  info "reloading rowbot"
+  exec "$0" --reload "${original_args[@]}"
 }
 
 trap config-reload HUP
@@ -791,7 +804,11 @@ hook_post_NICK_alternick() {
 ###
 
 if [[ $reload = yes ]]; then
-  privmsg "$TO" done.
+  if [[ -v TO ]]; then
+    privmsg "$TO" done.
+  else
+    info done.
+  fi
 else
   registered=no
   info "rowbot's pid is %d" "$BASHPID"