--- rxvt-unicode/src/rxvtfont.C	2007/11/25 11:23:18	1.125
+++ rxvt-unicode/src/rxvtfont.C	2008/01/07 12:41:31	1.127
@@ -21,7 +21,6 @@
 
 #include "../config.h"
 #include "rxvt.h"
-#include "rxvtlib.h"
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 
@@ -634,7 +633,7 @@
     {
       size_t len = field - name;
       *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
-      strncpy (*ptr, name, len);
+      memcpy (*ptr, name, len);
       strcpy (*ptr + len, replace);
       strcat (*ptr, end);
 
@@ -1535,7 +1534,7 @@
 
           if (end - desc < 511)
             {
-              strncpy (buf, desc, end - desc);
+              memcpy (buf, desc, end - desc);
               buf[end - desc] = 0;
 
               fonts.push_back (new_font (buf, cs));