diff --git a/appl/popper/README-FIRST b/appl/popper/README-FIRST
index 7b706bca3..3d78fb644 100644
--- a/appl/popper/README-FIRST
+++ b/appl/popper/README-FIRST
@@ -1,10 +1,11 @@
 This kerberized popper was based on popper-1.831beta
 which was later announced as "offical" and not beta.
 
+This program is able to talk both the pop3 and the kpop3 protocol.
+
 Please note that the server principal is pop.hostname and not
 rcmd.hostname. I.e an additional entry is needed in your mailhub's
-/etc/srvtab. Use ksrvutil and kadmin to add the extra prinicpal.
+/etc/srvtab. Use ksrvutil to add the extra prinicpal.
 
 The server is usually started from inetd and there is already an entry
 for that in inetd.conf.changes.
-
diff --git a/appl/popper/README-KRB4 b/appl/popper/README-KRB4
index 828718176..f029cf97c 100644
--- a/appl/popper/README-KRB4
+++ b/appl/popper/README-KRB4
@@ -1 +1,3 @@
-Define KERBEROS if you want Kerberos V4 style authentification.
+Define KERBEROS if you want support for Kerberos V4 style
+authentification, then you will be able to start a kerberise pop with
+the `-k' flag.
diff --git a/appl/popper/pop_dele.c b/appl/popper/pop_dele.c
index 5b5a3fd93..1f19c1005 100644
--- a/appl/popper/pop_dele.c
+++ b/appl/popper/pop_dele.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_dele.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  dele:   Delete a message from the POP maildrop
diff --git a/appl/popper/pop_dropcopy.c b/appl/popper/pop_dropcopy.c
index aa8442aec..3eb8b7255 100644
--- a/appl/popper/pop_dropcopy.c
+++ b/appl/popper/pop_dropcopy.c
@@ -10,8 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_dropcopy.c	2.6  2.6 4/3/91";
 #endif /* not lint */
 
 #include <popper.h>
-
-extern int      errno;
+RCSID("$Id$");
 
 /* 
  *  dropcopy:   Make a temporary copy of the user's mail drop and 
diff --git a/appl/popper/pop_dropinfo.c b/appl/popper/pop_dropinfo.c
index 4c25913c2..1d82f0de5 100644
--- a/appl/popper/pop_dropinfo.c
+++ b/appl/popper/pop_dropinfo.c
@@ -10,8 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_dropinfo.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
-
-extern int      errno;
+RCSID("$Id$");
 
 /* 
  *  dropinfo:   Extract information about the POP maildrop and store 
diff --git a/appl/popper/pop_get_command.c b/appl/popper/pop_get_command.c
index 89f50c9b8..4de761f15 100644
--- a/appl/popper/pop_get_command.c
+++ b/appl/popper/pop_get_command.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_get_command.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  get_command:    Extract the command from an input line form a POP client
diff --git a/appl/popper/pop_get_subcommand.c b/appl/popper/pop_get_subcommand.c
index 1012a88e9..d5a29b0e3 100644
--- a/appl/popper/pop_get_subcommand.c
+++ b/appl/popper/pop_get_subcommand.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_get_subcommand.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  get_subcommand: Extract a POP XTND subcommand from a client input line
diff --git a/appl/popper/pop_init.c b/appl/popper/pop_init.c
index a497ed02c..4b29cdf1f 100644
--- a/appl/popper/pop_init.c
+++ b/appl/popper/pop_init.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_init.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 #ifdef KERBEROS
 AUTH_DAT kdata;
@@ -98,7 +99,11 @@ pop_init(POP *p,int argcount,char **argmessage)
 #endif
 
     /*  Process command line arguments */
-    while ((c = getopt(argcount,argmessage,"kdt:")) != EOF)
+    while ((c = getopt(argcount,argmessage,
+#ifdef KERBEROS
+		       "k"
+#endif
+		       "dt:")) != EOF)
         switch (c) {
 
             /*  Debugging requested */
@@ -119,10 +124,12 @@ pop_init(POP *p,int argcount,char **argmessage)
                 trace_file_name = optarg;
                 break;
 
+#ifdef KERBEROS
 	    /* Use kerberos version of POP3 protocol */
 	    case 'k':
 		p->kerberosp = 1;
 		break;
+#endif
 
             /*  Timeout value passed.  Default changed */
             case 'T':
diff --git a/appl/popper/pop_last.c b/appl/popper/pop_last.c
index a0ac4de4d..25f146490 100644
--- a/appl/popper/pop_last.c
+++ b/appl/popper/pop_last.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_last.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  last:   Display the last message touched in a POP session
diff --git a/appl/popper/pop_list.c b/appl/popper/pop_list.c
index 3a1904361..cb52dd436 100644
--- a/appl/popper/pop_list.c
+++ b/appl/popper/pop_list.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_list.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  list:   List the contents of a POP maildrop
diff --git a/appl/popper/pop_log.c b/appl/popper/pop_log.c
index 05642d7be..58ce51edd 100644
--- a/appl/popper/pop_log.c
+++ b/appl/popper/pop_log.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_log.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  log:    Make a log entry
diff --git a/appl/popper/pop_lower.c b/appl/popper/pop_lower.c
index 865c1fb81..40e75226f 100644
--- a/appl/popper/pop_lower.c
+++ b/appl/popper/pop_lower.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_lower.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  lower:  Convert a string to lowercase
diff --git a/appl/popper/pop_msg.c b/appl/popper/pop_msg.c
index f3eb58ce1..e0ab12529 100644
--- a/appl/popper/pop_msg.c
+++ b/appl/popper/pop_msg.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_msg.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  msg:    Send a formatted line to the POP client
diff --git a/appl/popper/pop_parse.c b/appl/popper/pop_parse.c
index 91980c02a..a818ceccd 100644
--- a/appl/popper/pop_parse.c
+++ b/appl/popper/pop_parse.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_parse.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  parse:  Parse a raw input line from a POP client 
diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c
index 86f6609ba..cfab5d2ad 100644
--- a/appl/popper/pop_pass.c
+++ b/appl/popper/pop_pass.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_pass.c	2.3  2.3 4/2/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 #ifdef KERBEROS
 extern AUTH_DAT kdata;
diff --git a/appl/popper/pop_quit.c b/appl/popper/pop_quit.c
index f66f9758d..c6d66d853 100644
--- a/appl/popper/pop_quit.c
+++ b/appl/popper/pop_quit.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_quit.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  quit:   Terminate a POP session
diff --git a/appl/popper/pop_rset.c b/appl/popper/pop_rset.c
index 82a6f461d..30ff82d0f 100644
--- a/appl/popper/pop_rset.c
+++ b/appl/popper/pop_rset.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_rset.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  rset:   Unflag all messages flagged for deletion in a POP maildrop
diff --git a/appl/popper/pop_send.c b/appl/popper/pop_send.c
index abb20b74d..d77050d34 100644
--- a/appl/popper/pop_send.c
+++ b/appl/popper/pop_send.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_send.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /*
  *  sendline:   Send a line of a multi-line response to a client.
diff --git a/appl/popper/pop_stat.c b/appl/popper/pop_stat.c
index a2fdb9053..748cf7c94 100644
--- a/appl/popper/pop_stat.c
+++ b/appl/popper/pop_stat.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_stat.c	2.2  2.2 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  stat:   Display the status of a POP maildrop to its client
diff --git a/appl/popper/pop_updt.c b/appl/popper/pop_updt.c
index 962179031..079a25a49 100644
--- a/appl/popper/pop_updt.c
+++ b/appl/popper/pop_updt.c
@@ -10,8 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_updt.c	2.3  2.3 3/20/91";
 #endif /* not lint */
 
 #include <popper.h>
-
-extern int      errno;
+RCSID("$Id$");
 
 static char standard_error[] =
     "Error error updating primary drop. Mailbox unchanged";
diff --git a/appl/popper/pop_user.c b/appl/popper/pop_user.c
index eea0ec2ef..d390e8f1f 100644
--- a/appl/popper/pop_user.c
+++ b/appl/popper/pop_user.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_user.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  user:   Prompt for the user name at the start of a POP session
diff --git a/appl/popper/pop_xmit.c b/appl/popper/pop_xmit.c
index f8d0f6ba6..bcc236191 100644
--- a/appl/popper/pop_xmit.c
+++ b/appl/popper/pop_xmit.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_xmit.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /*
  *  xmit:   POP XTND function to receive a message from 
diff --git a/appl/popper/pop_xtnd.c b/appl/popper/pop_xtnd.c
index 46a05d970..8386f473d 100644
--- a/appl/popper/pop_xtnd.c
+++ b/appl/popper/pop_xtnd.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)pop_xtnd.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 /* 
  *  xtnd:   Handle extensions to the POP protocol suite
diff --git a/appl/popper/popper.c b/appl/popper/popper.c
index d6f99c72f..daf8f4610 100644
--- a/appl/popper/popper.c
+++ b/appl/popper/popper.c
@@ -10,6 +10,7 @@ static char SccsId[] = "@(#)@(#)popper.c	2.1  2.1 3/18/91";
 #endif /* not lint */
 
 #include <popper.h>
+RCSID("$Id$");
 
 int hangup = FALSE ;
 
@@ -116,26 +117,3 @@ main (int argc, char **argv)
 
     return(0);
 }
-
-#ifdef STRNCASECMP
-/*
- *  Perform a case-insensitive string comparision
- */
-int
-strncasecmp(char *str1, char *str2,int len)
-{
-    register int    i;
-    char            a,
-                    b;
-
-    for (i=len-1;i>=0;i--){
-        a = str1[i];
-        b = str2[i];
-        if (isupper(a)) a = tolower(str1[i]);
-        if (isupper(b)) b = tolower(str2[i]);
-        if (a > b) return (1);
-        if (a < b) return(-1);
-    }
-    return(0);
-}
-#endif /* STRNCASECMP */
diff --git a/appl/popper/popper.h b/appl/popper/popper.h
index 9a232bed6..c452768b2 100644
--- a/appl/popper/popper.h
+++ b/appl/popper/popper.h
@@ -8,6 +8,8 @@
  *
  */
 
+/* $Id$ */
+
 /*  LINTLIBRARY */
 
 /* 
diff --git a/appl/popper/version.h b/appl/popper/version.h
index 6c61caa04..bbdd5d716 100644
--- a/appl/popper/version.h
+++ b/appl/popper/version.h
@@ -8,8 +8,10 @@
  *
  */
 
+/* $Id$ */
+
 /*
  *  Current version of this POP implementation
  */
 
-#define VERSION         "1.831beta"
+#define VERSION         "1.831beta + krb4-0.9"