diff --git a/ChangeLog b/ChangeLog
index 5cb77bc73b..f3d9a675dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
 	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
 	(gtk_vscale_new_with_range): Add some additional docs on 
 	precision here too.  (#309238, Steve Chaplin)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5cb77bc73b..f3d9a675dc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
 	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
 	(gtk_vscale_new_with_range): Add some additional docs on 
 	precision here too.  (#309238, Steve Chaplin)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5cb77bc73b..f3d9a675dc 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-07-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.  
+	(#162979, Paul Cornett)
+
 	* gtk/gtkhscale.c (gtk_hscale_new_with_range): 
 	(gtk_vscale_new_with_range): Add some additional docs on 
 	precision here too.  (#309238, Steve Chaplin)
diff --git a/configure.in b/configure.in
index 3e7fd38472..e1e8d3dabc 100644
--- a/configure.in
+++ b/configure.in
@@ -471,6 +471,20 @@ case $host in
   ;;
 esac
 
+#
+# see bug 162979
+#
+AC_MSG_CHECKING(for HP-UX)
+case $host_os in
+  hpux9* | hpux10* | hpux11*)
+    AC_MSG_RESULT(yes)
+    CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
+  ;;
+  *)
+    AC_MSG_RESULT(no)
+  ;;
+esac
+
 dnl NeXTStep cc seems to need this
 AC_MSG_CHECKING([for extra flags for POSIX compliance])
 AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],