diff --git a/libratbox/src/commio.c b/libratbox/src/commio.c
index 54fc29c..e17d3b1 100644
--- a/libratbox/src/commio.c
+++ b/libratbox/src/commio.c
@@ -1134,7 +1134,7 @@ inetntoa(const char *in)
  * SOFTWARE.
  */
 
-#define SPRINTF(x) ((size_t)rb_sprintf x)
+#define SPRINTF(x) ((size_t)sprintf x)
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
@@ -1513,7 +1513,7 @@ rb_inet_pton(int af, const char *src, void *dst)
         /* Somebody might have passed as an IPv4 address this is sick but it works */
         if(inet_pton4(src, dst)) {
             char tmp[HOSTIPLEN];
-            rb_sprintf(tmp, "::ffff:%s", src);
+            sprintf(tmp, "::ffff:%s", src);
             return (inet_pton6(tmp, dst));
         } else
             return (inet_pton6(src, dst));
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 08710c5..3b566d5 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -494,7 +494,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
     else
         modes = empty_modes;
 
-    mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
+    mlen_uid = sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
                           use_id(source_p), (long) chptr->channelts, parv[2], modes);
     ptr_uid = buf_uid + mlen_uid;
 
@@ -579,7 +579,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
         }
 
         /* copy the nick to the two buffers */
-        len = rb_sprintf(ptr_uid, "%s ", use_id(target_p));
+        len = sprintf(ptr_uid, "%s ", use_id(target_p));
         ptr_uid += len;
         len_uid += len;
 
@@ -937,7 +937,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
             dir = MODE_DEL;
         }
         *mbuf++ = 'k';
-        len = rb_sprintf(pbuf, "%s ", oldmode->key);
+        len = sprintf(pbuf, "%s ", oldmode->key);
         pbuf += len;
     }
     if(oldmode->join_num && !mode->join_num) {
@@ -960,7 +960,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
             dir = MODE_ADD;
         }
         *mbuf++ = 'l';
-        len = rb_sprintf(pbuf, "%d ", mode->limit);
+        len = sprintf(pbuf, "%d ", mode->limit);
         pbuf += len;
     }
     if(mode->key[0] && strcmp(oldmode->key, mode->key)) {
@@ -969,7 +969,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
             dir = MODE_ADD;
         }
         *mbuf++ = 'k';
-        len = rb_sprintf(pbuf, "%s ", mode->key);
+        len = sprintf(pbuf, "%s ", mode->key);
         pbuf += len;
     }
     if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time)) {
@@ -978,7 +978,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
             dir = MODE_ADD;
         }
         *mbuf++ = 'j';
-        len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
+        len = sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
         pbuf += len;
     }
     if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward) {
@@ -987,7 +987,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
             dir = MODE_ADD;
         }
         *mbuf++ = 'f';
-        len = rb_sprintf(pbuf, "%s ", mode->forward);
+        len = sprintf(pbuf, "%s ", mode->forward);
         pbuf += len;
     }
     *mbuf = '\0';
@@ -1393,7 +1393,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
     pbuf = lparabuf;
 
-    cur_len = mlen = rb_sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
+    cur_len = mlen = sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
     mbuf = lmodebuf + mlen;
 
     RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head) {
@@ -1417,7 +1417,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
         *mbuf++ = c;
         cur_len += plen;
-        pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
+        pbuf += sprintf(pbuf, "%s ", banptr->banstr);
         count++;
 
         free_ban(banptr);
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 7e8dad9..1ea4274 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -140,7 +140,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
         target_p->flags |= FLAGS_KILLED;
     }
 
-    rb_sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
+    sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
     exit_client(client_p, target_p, source_p, buf);
 
@@ -247,7 +247,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
     /* FLAGS_KILLED prevents a quit being sent out */
     target_p->flags |= FLAGS_KILLED;
 
-    rb_sprintf(buf, "Killed (%s %s)", source_p->name, reason);
+    sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
     exit_client(client_p, target_p, source_p, buf);
 
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 13beb1c..703ea95 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -293,7 +293,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
         fakesource_p = &me;
     else
         fakesource_p = source_p;
-    mlen = rb_sprintf(modebuf, ":%s MODE %s +", fakesource_p->name, chptr->chname);
+    mlen = sprintf(modebuf, ":%s MODE %s +", fakesource_p->name, chptr->chname);
     mbuf = modebuf + mlen;
     pbuf = parabuf;
 
@@ -337,7 +337,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
             }
 
             *mbuf++ = parv[3][0];
-            arglen = rb_sprintf(pbuf, "%s ", s);
+            arglen = sprintf(pbuf, "%s ", s);
             pbuf += arglen;
             plen += arglen;
             modecount++;
diff --git a/modules/m_cap.c b/modules/m_cap.c
index 545aa81..ccb0a04 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -173,7 +173,7 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clea
     int curlen, mlen;
     size_t i;
 
-    mlen = rb_sprintf(buf, ":%s CAP %s %s",
+    mlen = sprintf(buf, ":%s CAP %s %s",
                       me.name,
                       EmptyString(source_p->name) ? "*" : source_p->name,
                       subcmd);
@@ -237,7 +237,7 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clea
             }
         }
 
-        curlen = rb_sprintf(p, "%s ", clicap_list[i].name);
+        curlen = sprintf(p, "%s ", clicap_list[i].name);
         p += curlen;
         buflen += curlen;
     }
diff --git a/modules/m_ison.c b/modules/m_ison.c
index 5964414..379fe73 100644
--- a/modules/m_ison.c
+++ b/modules/m_ison.c
@@ -75,7 +75,7 @@ m_ison(struct Client *client_p, struct Client *source_p, int parc, const char *p
     current_insert_point2 = buf2;
     *buf2 = '\0';
 
-    rb_sprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
+    sprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
     len = strlen(buf);
     current_insert_point = buf + len;
 
diff --git a/modules/m_names.c b/modules/m_names.c
index 4d2be21..70a9765 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -128,7 +128,7 @@ names_global(struct Client *source_p)
         chptr = ptr->data;
         channel_member_names(chptr, source_p, 0);
     }
-    cur_len = mlen = rb_sprintf(buf, form_str(RPL_NAMREPLY),
+    cur_len = mlen = sprintf(buf, form_str(RPL_NAMREPLY),
                                 me.name, source_p->name, "*", "*");
     t = buf + mlen;
 
@@ -167,7 +167,7 @@ names_global(struct Client *source_p)
             t = buf + mlen;
         }
 
-        tlen = rb_sprintf(t, "%s ", target_p->name);
+        tlen = sprintf(t, "%s ", target_p->name);
         cur_len += tlen;
         t += tlen;
     }
diff --git a/modules/m_restart.c b/modules/m_restart.c
index f9e0567..df3ca78 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -123,7 +123,7 @@ do_restart(struct Client *source_p, const char *servername)
                    me.name, get_client_name(source_p, HIDE_IP));
     }
 
-    rb_sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
+    sprintf(buf, "Server RESTART by %s", get_client_name(source_p, HIDE_IP));
     restart(buf);
 
     return 0;
diff --git a/modules/m_time.c b/modules/m_time.c
index 68908a5..1eb3c20 100644
--- a/modules/m_time.c
+++ b/modules/m_time.c
@@ -108,7 +108,7 @@ date(void)
     if(minswest < 0)
         minswest = -minswest;
 
-    rb_sprintf(buf, "%s %s %d %d -- %02u:%02u:%02u %c%02u:%02u",
+    sprintf(buf, "%s %s %d %d -- %02u:%02u:%02u %c%02u:%02u",
                weekdays[lt->tm_wday], months[lt->tm_mon], lt->tm_mday,
                lt->tm_year + 1900, lt->tm_hour, lt->tm_min, lt->tm_sec,
                plus, minswest / 60, minswest % 60);
diff --git a/modules/m_topic.c b/modules/m_topic.c
index bbffb79..9f44ba8 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -135,7 +135,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
         }
 
         if(ConfigChannel.host_in_topic)
-            rb_sprintf(topic_info, "%s!%s@%s",
+            sprintf(topic_info, "%s!%s@%s",
                        source_p->name, source_p->username, source_p->host);
         else
             rb_strlcpy(topic_info, source_p->name, sizeof(topic_info));
diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index ff3b777..55093ee 100644
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -62,7 +62,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
     int cur_len;
     int rl;
 
-    cur_len = rb_sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
+    cur_len = sprintf(buf, form_str(RPL_USERHOST), me.name, source_p->name, "");
     t = buf + cur_len;
 
     for (i = 1; i <= 5; i++) {
@@ -77,14 +77,14 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
              * is.  Useful for things like NAT, and dynamic dial-up users.
              */
             if(MyClient(target_p) && (target_p == source_p)) {
-                rl = rb_sprintf(response, "%s%s=%c%s@%s ",
+                rl = sprintf(response, "%s%s=%c%s@%s ",
                                 target_p->name,
                                 IsOper(target_p) ? "*" : "",
                                 (target_p->user->away) ? '-' : '+',
                                 target_p->username,
                                 target_p->sockhost);
             } else {
-                rl = rb_sprintf(response, "%s%s=%c%s@%s ",
+                rl = sprintf(response, "%s%s=%c%s@%s ",
                                 target_p->name,
                                 IsOper(target_p) ? "*" : "",
                                 (target_p->user->away) ? '-' : '+',
@@ -92,7 +92,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
             }
 
             if((rl + cur_len) < (BUFSIZE - 10)) {
-                rb_sprintf(t, "%s", response);
+                sprintf(t, "%s", response);
                 t += rl;
                 cur_len += rl;
             } else
diff --git a/modules/m_who.c b/modules/m_who.c
index 1a1b007..71ca29c 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -465,7 +465,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
     size_t pos;
     const char *q;
 
-    rb_sprintf(status, "%c%s%s",
+    sprintf(status, "%c%s%s",
                target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
 
     if (fmt->fields == 0)
diff --git a/modules/m_whois.c b/modules/m_whois.c
index eef1d4b..e021da7 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -244,7 +244,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                        target_p->name, target_p->username,
                        target_p->host, target_p->info);
 
-    cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
+    cur_len = mlen = sprintf(buf, form_str(RPL_WHOISCHANNELS),
                                 get_id(&me, source_p), get_id(source_p, source_p),
                                 target_p->name);
 
@@ -276,7 +276,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                     t = buf + mlen;
                 }
 
-                tlen = rb_sprintf(t, "%s%s%s ",
+                tlen = sprintf(t, "%s%s%s ",
                                   visible ? "" : "*",
                                   find_channel_status(msptr, 1),
                                   chptr->chname);
diff --git a/src/channel.c b/src/channel.c
index b0da262..1502e85 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -565,7 +565,7 @@ channel_member_names(struct Channel *chptr, struct Client *client_p, int show_eo
     if(ShowChannel(client_p, chptr)) {
         is_member = IsMember(client_p, chptr);
 
-        cur_len = mlen = rb_sprintf(lbuf, form_str(RPL_NAMREPLY),
+        cur_len = mlen = sprintf(lbuf, form_str(RPL_NAMREPLY),
                                     me.name, client_p->name,
                                     channel_pub_or_secret(chptr), chptr->chname);
 
@@ -586,7 +586,7 @@ channel_member_names(struct Channel *chptr, struct Client *client_p, int show_eo
                 t = lbuf + mlen;
             }
 
-            tlen = rb_sprintf(t, "%s%s ", find_channel_status(msptr, stack),
+            tlen = sprintf(t, "%s%s ", find_channel_status(msptr, stack),
                               target_p->name);
 
             cur_len += tlen;
@@ -648,8 +648,8 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
 
     /* if the buffers havent been built, do it here */
     if(s == NULL) {
-        rb_sprintf(src_host, "%s!%s@%s", who->name, who->username, who->host);
-        rb_sprintf(src_iphost, "%s!%s@%s", who->name, who->username, who->sockhost);
+        sprintf(src_host, "%s!%s@%s", who->name, who->username, who->host);
+        sprintf(src_iphost, "%s!%s@%s", who->name, who->username, who->sockhost);
 
         s = src_host;
         s2 = src_iphost;
@@ -657,13 +657,13 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
     if(who->localClient->mangledhost != NULL) {
         /* if host mangling mode enabled, also check their real host */
         if(!strcmp(who->host, who->localClient->mangledhost)) {
-            rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->orighost);
+            sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->orighost);
             s3 = src_althost;
         }
         /* if host mangling mode not enabled and no other spoof,
          * also check the mangled form of their host */
         else if (!IsDynSpoof(who)) {
-            rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
+            sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
             s3 = src_althost;
         }
     }
@@ -741,8 +741,8 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
 
     /* if the buffers havent been built, do it here */
     if(s == NULL) {
-        rb_sprintf(src_host, "%s!%s@%s", who->name, who->username, who->host);
-        rb_sprintf(src_iphost, "%s!%s@%s", who->name, who->username, who->sockhost);
+        sprintf(src_host, "%s!%s@%s", who->name, who->username, who->host);
+        sprintf(src_iphost, "%s!%s@%s", who->name, who->username, who->sockhost);
 
         s = src_host;
         s2 = src_iphost;
@@ -750,13 +750,13 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
     if(who->localClient->mangledhost != NULL) {
         /* if host mangling mode enabled, also check their real host */
         if(!strcmp(who->host, who->localClient->mangledhost)) {
-            rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->orighost);
+            sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->orighost);
             s3 = src_althost;
         }
         /* if host mangling mode not enabled and no other spoof,
          * also check the mangled form of their host */
         else if (!IsDynSpoof(who)) {
-            rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
+            sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
             s3 = src_althost;
         }
     }
@@ -834,18 +834,18 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
 
     s_assert(source_p->localClient != NULL);
 
-    rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
-    rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
+    sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
+    sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
     if(source_p->localClient->mangledhost != NULL) {
         /* if host mangling mode enabled, also check their real host */
         if(!strcmp(source_p->host, source_p->localClient->mangledhost)) {
-            rb_sprintf(src_althost, "%s!%s@%s", source_p->name, source_p->username, source_p->orighost);
+            sprintf(src_althost, "%s!%s@%s", source_p->name, source_p->username, source_p->orighost);
             use_althost = 1;
         }
         /* if host mangling mode not enabled and no other spoof,
          * also check the mangled form of their host */
         else if (!IsDynSpoof(source_p)) {
-            rb_sprintf(src_althost, "%s!%s@%s", source_p->name, source_p->username, source_p->localClient->mangledhost);
+            sprintf(src_althost, "%s!%s@%s", source_p->name, source_p->username, source_p->localClient->mangledhost);
             use_althost = 1;
         }
     }
@@ -1036,8 +1036,8 @@ find_bannickchange_channel(struct Client *client_p)
     if (!MyClient(client_p) || IsOverride(client_p))
         return NULL;
 
-    rb_sprintf(src_host, "%s!%s@%s", client_p->name, client_p->username, client_p->host);
-    rb_sprintf(src_iphost, "%s!%s@%s", client_p->name, client_p->username, client_p->sockhost);
+    sprintf(src_host, "%s!%s@%s", client_p->name, client_p->username, client_p->host);
+    sprintf(src_iphost, "%s!%s@%s", client_p->name, client_p->username, client_p->sockhost);
 
     RB_DLINK_FOREACH(ptr, client_p->user->channel.head) {
         msptr = ptr->data;
@@ -1289,21 +1289,21 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
         *mbuf++ = 'l';
 
         if(!IsClient(client_p) || IsMember(client_p, chptr))
-            pbuf += rb_sprintf(pbuf, " %d", chptr->mode.limit);
+            pbuf += sprintf(pbuf, " %d", chptr->mode.limit);
     }
 
     if(*chptr->mode.key) {
         *mbuf++ = 'k';
 
         if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-            pbuf += rb_sprintf(pbuf, " %s", chptr->mode.key);
+            pbuf += sprintf(pbuf, " %s", chptr->mode.key);
     }
 
     if(chptr->mode.join_num) {
         *mbuf++ = 'j';
 
         if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-            pbuf += rb_sprintf(pbuf, " %d:%d", chptr->mode.join_num,
+            pbuf += sprintf(pbuf, " %d:%d", chptr->mode.join_num,
                                chptr->mode.join_time);
     }
 
@@ -1311,7 +1311,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
         *mbuf++ = 'f';
 
         if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-            pbuf += rb_sprintf(pbuf, " %s", chptr->mode.forward);
+            pbuf += sprintf(pbuf, " %s", chptr->mode.forward);
     }
 
     *mbuf = '\0';
@@ -1453,7 +1453,7 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
         cap = chcap_combos[j].cap_yes;
         nocap = chcap_combos[j].cap_no;
 
-        mbl = preflen = rb_sprintf(modebuf, ":%s TMODE %ld %s ",
+        mbl = preflen = sprintf(modebuf, ":%s TMODE %ld %s ",
                                    use_id(source_p), (long) chptr->channelts,
                                    chptr->chname);
 
@@ -1513,7 +1513,7 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
             nc++;
 
             if(arg != NULL) {
-                len = rb_sprintf(pbuf, "%s ", arg);
+                len = sprintf(pbuf, "%s ", arg);
                 pbuf += len;
                 pbl += len;
                 mc++;
diff --git a/src/chmode.c b/src/chmode.c
index 282e880..0a7623f 100644
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -277,7 +277,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
 
 
     if(IsPerson(source_p))
-        rb_sprintf(who, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
+        sprintf(who, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
     else
         rb_strlcpy(who, source_p->name, sizeof(who));
 
@@ -383,7 +383,7 @@ pretty_mask(const char *idmask)
     old_mask_pos = mask_pos;
 
     if (*mask == '$') {
-        mask_pos += rb_sprintf(mask_buf + mask_pos, "%s", mask) + 1;
+        mask_pos += sprintf(mask_buf + mask_pos, "%s", mask) + 1;
         t = mask_buf + old_mask_pos + 1;
         if (*t == '!')
             *t = '~';
@@ -440,7 +440,7 @@ pretty_mask(const char *idmask)
         host[HOSTLEN] = '\0';
     }
 
-    mask_pos += rb_sprintf(mask_buf + mask_pos, "%s!%s@%s", nick, user, host) + 1;
+    mask_pos += sprintf(mask_buf + mask_pos, "%s!%s@%s", nick, user, host) + 1;
 
     /* restore mask, since we may need to use it again later */
     if(at)
@@ -1462,7 +1462,7 @@ chm_limit(struct Client *source_p, struct Channel *chptr,
         if(EmptyString(lstr) || (limit = atoi(lstr)) <= 0)
             return;
 
-        rb_sprintf(limitstr, "%d", limit);
+        sprintf(limitstr, "%d", limit);
 
         mode_changes[mode_count].letter = c;
         mode_changes[mode_count].dir = MODE_ADD;
@@ -2102,9 +2102,9 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
         return;
 
     if(IsServer(source_p))
-        rb_sprintf(cmdbuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
+        sprintf(cmdbuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
     else
-        rb_sprintf(cmdbuf, ":%s!%s@%s MODE %s ",
+        sprintf(cmdbuf, ":%s!%s@%s MODE %s ",
                    source_p->name, source_p->username,
                    source_p->host, chptr->chname);
 
@@ -2186,7 +2186,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
 
                 if(mode_changes[i].arg != NULL) {
                     paracount++;
-                    len = rb_sprintf(pbuf, "%s ", mode_changes[i].arg);
+                    len = sprintf(pbuf, "%s ", mode_changes[i].arg);
                     pbuf += len;
                     paralen += len;
                 }
diff --git a/src/parse.c b/src/parse.c
index 51d5076..24287ff 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -567,10 +567,10 @@ do_numeric(char numeric[], struct Client *client_p, struct Client *source_p, int
         int i;
         int tl;		/* current length of presently being built string in t */
         for (i = 2; i < (parc - 1); i++) {
-            tl = rb_sprintf(t, " %s", parv[i]);
+            tl = sprintf(t, " %s", parv[i]);
             t += tl;
         }
-        rb_sprintf(t, " :%s", parv[parc - 1]);
+        sprintf(t, " :%s", parv[parc - 1]);
     }
 
     if((target_p = find_client(parv[1])) != NULL) {
diff --git a/src/res.c b/src/res.c
index 7dea349..38b766d 100644
--- a/src/res.c
+++ b/src/res.c
@@ -444,7 +444,7 @@ static void do_query_number(struct DNSQuery *query, const struct rb_sockaddr_sto
         const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
         cp = (const unsigned char *)&v4->sin_addr.s_addr;
 
-        rb_sprintf(request->queryname, "%u.%u.%u.%u.in-addr.arpa", (unsigned int)(cp[3]),
+        sprintf(request->queryname, "%u.%u.%u.%u.in-addr.arpa", (unsigned int)(cp[3]),
                    (unsigned int)(cp[2]), (unsigned int)(cp[1]), (unsigned int)(cp[0]));
     }
 #ifdef RB_IPV6
diff --git a/src/s_serv.c b/src/s_serv.c
index 8d44855..0927d1b 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -375,7 +375,7 @@ send_capabilities(struct Client *client_p, int cap_can_send)
 
     for (cap = captab; cap->name; ++cap) {
         if(cap->cap & cap_can_send) {
-            tl = rb_sprintf(t, "%s ", cap->name);
+            tl = sprintf(t, "%s ", cap->name);
             t += tl;
         }
     }
@@ -470,7 +470,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
     int mlen;
     int cur_len;
 
-    cur_len = mlen = rb_sprintf(buf, ":%s BMASK %ld %s %c :",
+    cur_len = mlen = sprintf(buf, ":%s BMASK %ld %s %c :",
                                 me.id, (long) chptr->channelts, chptr->chname, flag);
     t = buf + mlen;
 
@@ -494,7 +494,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
             t = buf + mlen;
         }
 
-        rb_sprintf(t, "%s ", banptr->banstr);
+        sprintf(t, "%s ", banptr->banstr);
         t += tlen;
         cur_len += tlen;
     }
@@ -598,7 +598,7 @@ burst_TS6(struct Client *client_p)
         if(*chptr->chname != '#')
             continue;
 
-        cur_len = mlen = rb_sprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
+        cur_len = mlen = sprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
                                     (long) chptr->channelts, chptr->chname,
                                     channel_modes(chptr, client_p));
 
@@ -626,7 +626,7 @@ burst_TS6(struct Client *client_p)
                 t = buf + mlen;
             }
 
-            rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1),
+            sprintf(t, "%s%s ", find_channel_status(msptr, 1),
                        use_id(msptr->client_p));
 
             cur_len += tlen;
diff --git a/src/s_user.c b/src/s_user.c
index b7295cd..8e39c8b 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -469,7 +469,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
         ServerStats.is_ref++;
         sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
                           "only alphanumeric characters.");
-        rb_sprintf(tmpstr2, "Invalid username [%s]", source_p->username);
+        sprintf(tmpstr2, "Invalid username [%s]", source_p->username);
         exit_client(client_p, source_p, &me, tmpstr2);
         return (CLIENT_EXITED);
     }