diff --git a/Makefile.conf b/Makefile.conf
index 2af36bd6..3f60a62a 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -395,12 +395,12 @@ MINORVERSION=MinorVersion
 ##--irix--
 
 ## HP-UX
-##--hpux--
+##--hpux-cc--
 #COPTS = $(BINDDEF)
 #LFLAGS = -Wl,+vnocompatwarnings
 #INSTALL = install -i
 #MANINSTALL = install -i
-##--hpux
+##--hpux-cc
 
 ## HP-UX with gcc
 #--hpux-gcc--
@@ -410,4 +410,4 @@ MINORVERSION=MinorVersion
 #ADMMANEXT = .8
 #FFMANEXT = .5
 #MANINSTALL = install -i -m 444
-#--hpux-gcc--
+##--hpux-gcc--
diff --git a/configure b/configure
index b7d9d42c..297581b4 100755
--- a/configure
+++ b/configure
@@ -89,13 +89,18 @@ if [ "$sysname" = "" ]; then
     FreeBSD)
       sysname=freebsd;;
     hpux)
-      sysname=hpux;;
+      set `which gcc`
+	if [ $# = 1 ]; then
+	  sysname=hpux-gcc
+	else
+	  sysname=hpux-cc
+	fi;;
     HP-UX)
       set `which gcc`
 	if [ $# = 1 ]; then
 	  sysname=hpux-gcc
 	else
-	  sysname=hpux
+	  sysname=hpux-cc
 	fi;;
     QNX)
       sysname=qnx;;