diff --git a/appl/popper/pop_log.c b/appl/popper/pop_log.c
index f1abc90b0..c10cadaeb 100644
--- a/appl/popper/pop_log.c
+++ b/appl/popper/pop_log.c
@@ -11,27 +11,14 @@ RCSID("$Id$");
  *  log:    Make a log entry
  */
 
-static char msgbuf[MAXLINELEN];
-
 int
 pop_log(POP *p, int stat, char *format, ...)
 {
+    static char msgbuf[MAXLINELEN];
     va_list     ap;
 
     va_start(ap, format);
-#ifdef HAVE_VSPRINTF
-        vsprintf(msgbuf,format,ap);
-#else
-        {
-	    int a0 = va_arg(ap, int);
-	    int a1 = va_arg(ap, int);
-	    int a2 = va_arg(ap, int);
-	    int a3 = va_arg(ap, int);
-	    int a4 = va_arg(ap, int);
-	    int a5 = va_arg(ap, int);
-	    sprintf(msgbuf, format, a0, a1, a2, a3, a4, a5, 0, 4711);
-	}
-#endif /* HAVE_VSPRINTF */
+    vsprintf(msgbuf,format,ap);
 
     if (p->debug && p->trace) {
         fprintf(p->trace,"%s\n",msgbuf);
diff --git a/appl/popper/pop_msg.c b/appl/popper/pop_msg.c
index a45618f0a..dfcfaff84 100644
--- a/appl/popper/pop_msg.c
+++ b/appl/popper/pop_msg.c
@@ -34,19 +34,7 @@ pop_msg(POP *p, int stat, char *format, ...)
 
     /*  Append the message (formatted, if necessary) */
     if (format) 
-#ifdef HAVE_VSPRINTF
         vsprintf(mp,format,ap);
-#else
-        {
-	    int a0 = va_arg(ap, int);
-	    int a1 = va_arg(ap, int);
-	    int a2 = va_arg(ap, int);
-	    int a3 = va_arg(ap, int);
-	    int a4 = va_arg(ap, int);
-	    int a5 = va_arg(ap, int);
-	    sprintf(mp, format, a0, a1, a2, a3, a4, a5, 0, 4711);
-	}
-#endif /* HAVE_VSPRINTF */
     
     /*  Log the message if debugging is turned on */
 #ifdef DEBUG