diff --git a/arscan.c b/arscan.c
index f3bb3ce9..da9428de 100644
--- a/arscan.c
+++ b/arscan.c
@@ -1,5 +1,5 @@
 /* Library function for scanning an archive file.
-   Copyright (C) 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1987, 89, 91, 92, 93, 94 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -428,7 +428,13 @@ ar_name_equal (name, mem, truncated)
 #else
       struct ar_hdr hdr;
       return !strncmp (name, mem,
-		       sizeof (hdr.ar_name) - 1);
+		       sizeof (hdr.ar_name) - 
+#ifndef __hpux
+		       1
+#else
+		       2
+#endif /* __hpux */
+		       );
 #endif
     }
 
diff --git a/default.c b/default.c
index 3465c538..c8502a9b 100644
--- a/default.c
+++ b/default.c
@@ -195,7 +195,13 @@ static char *default_suffix_rules[] =
 static char *default_variables[] =
   {
     "AR", "ar",
+#ifndef __hpux
     "ARFLAGS", "rv",
+#else
+    /* HPUX ar's f flag says to truncate the file names to archive member
+       name length in comparisons, so replacement notices the equality.  */
+    "ARFLAGS", "rfv",
+#endif
     "AS", "as",
     "CC", "cc",
     "CXX", "g++",