diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 60d5a187..dc81c431 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -88,8 +88,7 @@ rehash_motd(struct Client *source_p)
 			     "%s is forcing re-reading of MOTD file",
 			     get_oper_name(source_p));
 
-	free_cachefile(user_motd);
-	user_motd = cache_file(MPATH, "ircd.motd", 0);
+	cache_user_motd();
 }
 
 static void
diff --git a/src/ircd.c b/src/ircd.c
index 25dec90c..6a80edd6 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -314,8 +314,7 @@ check_rehash(void *unused)
 	{
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Got signal SIGUSR1, reloading ircd motd file");
-		free_cachefile(user_motd);
-		user_motd = cache_file(MPATH, "ircd.motd", 0);
+		cache_user_motd();
 		doremotd = 0;
 	}
 }