diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index e80a19a45..193939567 100644
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -121,11 +121,11 @@ do_host_cloak_ip(const char *inbuf, char *outbuf)
 
 	if(ipv6)
 	{
-	    snprintf(outbuf, HOSTLEN, "%s:%x", buf, accum);
+	    rb_snprintf(outbuf, HOSTLEN, "%s:%x", buf, accum);
 	}
 	else
 	{
-	    snprintf(outbuf, HOSTLEN, "%s.%x", buf, accum);
+	    rb_snprintf(outbuf, HOSTLEN, "%s.%x", buf, accum);
 	}
 }
 
diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 9659f11b2..5a5bd67a6 100644
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -58,7 +58,7 @@ is_safe_error(const char *message)
 
 	if (!strncmp(message, "Closing Link: 127.0.0.1 (", 25))
 		return 1;
-	snprintf(prefix2, sizeof prefix2,
+	rb_snprintf(prefix2, sizeof prefix2,
 			"Closing Link: 127.0.0.1 %s (", me.name);
 	if (!strncmp(message, prefix2, strlen(prefix2)))
 		return 1;
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 6ab85deab..72c9b8497 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -297,7 +297,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, name);
 
-		snprintf(squitreason, sizeof squitreason,
+		rb_snprintf(squitreason, sizeof squitreason,
 				"Server %s already exists",
 				name);
 		exit_client(client_p, client_p, &me, squitreason);
@@ -477,7 +477,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		ilog(L_SERVER, "Link %s cancelled, server %s already exists",
 			client_p->name, parv[1]);
 
-		snprintf(squitreason, sizeof squitreason,
+		rb_snprintf(squitreason, sizeof squitreason,
 				"Server %s already exists",
 				parv[1]);
 		exit_client(NULL, client_p, &me, squitreason);
@@ -496,7 +496,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		ilog(L_SERVER, "Link %s cancelled, SID %s for server %s already in use by %s",
 			client_p->name, parv[3], parv[1], target_p->name);
 
-		snprintf(squitreason, sizeof squitreason,
+		rb_snprintf(squitreason, sizeof squitreason,
 				"SID %s for %s already in use by %s",
 				parv[3], parv[1], target_p->name);
 		exit_client(NULL, client_p, &me, squitreason);
diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index 1193c69e2..a6ce57551 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -89,9 +89,9 @@ add_monitor(struct Client *client_p, const char *nicks)
 				sendto_one(client_p, "%s", offbuf);
 
 			if(p)
-				snprintf(buf, sizeof(buf), "%s,%s", name, p);
+				rb_snprintf(buf, sizeof(buf), "%s,%s", name, p);
 			else
-				snprintf(buf, sizeof(buf), "%s", name);
+				rb_snprintf(buf, sizeof(buf), "%s", name);
 
 			sendto_one(client_p, form_str(ERR_MONLISTFULL),
 					me.name, client_p->name,
diff --git a/modules/m_services.c b/modules/m_services.c
index a78cc7f25..ffc77cd5f 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -195,7 +195,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 			kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
 						me.name);
 
-		snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+		rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
 			me.name);
 		exit_client(NULL, exist_p, &me, buf);
 	}
diff --git a/modules/m_signon.c b/modules/m_signon.c
index d57d953a9..f28021ff0 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -214,7 +214,7 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
 		kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
 					me.name);
 
-		snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+		rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
 			me.name);
 		exit_client(NULL, exist_p, &me, buf);
 	}else if((exist_p = find_client(nick)) && IsUnknown(exist_p) && exist_p != target_p) {
diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index 740f8d7df..27ff52570 100644
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -71,7 +71,7 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
 				     "Link %s dropped, wrong TS protocol version (%s,%s)",
 				     source_p->name, parv[1], parv[2]);
-		snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)",
+		rb_snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)",
 				parv[1], parv[2]);
 		exit_client(source_p, source_p, source_p, squitreason);
 		return 0;
@@ -95,7 +95,7 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char
 		     "Link %s dropped, excessive TS delta"
 		     " (my TS=%ld, their TS=%ld, delta=%d)",
 		     log_client_name(source_p, SHOW_IP), (long) rb_current_time(), (long) theirtime, deltat);
-		snprintf(squitreason, sizeof squitreason, "Excessive TS delta (my TS=%ld, their TS=%ld, delta=%d)",
+		rb_snprintf(squitreason, sizeof squitreason, "Excessive TS delta (my TS=%ld, their TS=%ld, delta=%d)",
 				(long) rb_current_time(), (long) theirtime, deltat);
 		exit_client(source_p, source_p, source_p, squitreason);
 		return 0;
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 40a8d52e6..085e4d64d 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -200,7 +200,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			char buffer[BUFSIZE];
 
-			snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+			rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
 				target_p->name, target_p->username,
 				target_p->host, target_p->servptr->name);
 			report_operspy(source_p, "WHOIS", buffer);
diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 0de08b6d8..89a0a7bb7 100644
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -850,15 +850,15 @@ void irc_dictionary_stats(struct Dictionary *dict, void (*cb)(const char *line,
 	s_assert(dict != NULL);
 
 	if (dict->id != NULL)
-		snprintf(str, sizeof str, "Dictionary stats for %s (%d)",
+		rb_snprintf(str, sizeof str, "Dictionary stats for %s (%d)",
 				dict->id, dict->count);
 	else
-		snprintf(str, sizeof str, "Dictionary stats for <%p> (%d)",
+		rb_snprintf(str, sizeof str, "Dictionary stats for <%p> (%d)",
 				(void *)dict, dict->count);
 	cb(str, privdata);
 	maxdepth = 0;
 	sum = stats_recurse(dict->root, 0, &maxdepth);
-	snprintf(str, sizeof str, "Depth sum %d Avg depth %d Max depth %d", sum, sum / dict->count, maxdepth);
+	rb_snprintf(str, sizeof str, "Depth sum %d Avg depth %d Max depth %d", sum, sum / dict->count, maxdepth);
 	cb(str, privdata);
 	return;
 }
diff --git a/src/parse.c b/src/parse.c
index 970ad7f63..5fe0585dc 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -364,7 +364,7 @@ handle_command(struct Message *mptr, struct Client *client_p,
 		ilog(L_SERVER,
 		     "Insufficient parameters (%d < %d) for command '%s' from %s.",
 		     i, ehandler.min_para, mptr->cmd, client_p->name);
-		snprintf(squitreason, sizeof squitreason,
+		rb_snprintf(squitreason, sizeof squitreason,
 				"Insufficient parameters (%d < %d) for command '%s'",
 				i, ehandler.min_para, mptr->cmd);
 		exit_client(client_p, client_p, client_p, squitreason);