diff --git a/authd/authd.c b/authd/authd.c
index e11451845..b4502a685 100644
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -29,9 +29,10 @@ static void handle_stat(int parc, char *parv[]);
 
 rb_helper *authd_helper = NULL;
 authd_cmd_handler authd_cmd_handlers[256] = {
+<<<<<<< HEAD
 	['C'] = handle_new_connection,
 	['D'] = resolve_dns,
-	['H'] = handle_reload,
+	['R'] = handle_reload,
 	['S'] = handle_stat,
 };
 
@@ -67,7 +68,10 @@ handle_reload(int parc, char *parv[])
 
 	if(parc < 2)
 	{
-		warn_opers(L_CRIT, "BUG: handle_reload received too few parameters (at least 2 expected, got %d)", parc);
+		/* Reload all handlers */
+		for(size_t i = 0; i < sizeof(authd_reload_handlers); handler = authd_reload_handlers[i++])
+			handler(parv[1][0]);
+
 		return;
 	}
 
diff --git a/ircd/dns.c b/ircd/dns.c
index ce3cd6c29..a3a8077e1 100644
--- a/ircd/dns.c
+++ b/ircd/dns.c
@@ -303,7 +303,7 @@ void
 reload_nameservers(void)
 {
 	check_authd();
-	rb_helper_write(authd_helper, "H D");
+	rb_helper_write(authd_helper, "R D");
 	(void)get_nameservers(stats_results_callback, NULL);
 }