diff --git a/ChangeLog b/ChangeLog
index 482516a42..479202b0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Change the shared libary extension for hpux-ia64
+	to so.  (#328253, The Written Word)
+
 Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gutils.c (_g_getenv_nomalloc): wiped out all the wonderfull
@@ -7,7 +12,7 @@ Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 Mon Jan 23 16:46:20 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gslice.c (slice_config_init): initialize GSlice config from
-	G_SLICE environemtn variable. we support G_SLICE=always-malloc
+	G_SLICE environment variable. we support G_SLICE=always-malloc
 	currently, which forces all g_slice_*() allocations to use the system
 	malloc instead.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 482516a42..479202b0a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Change the shared libary extension for hpux-ia64
+	to so.  (#328253, The Written Word)
+
 Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gutils.c (_g_getenv_nomalloc): wiped out all the wonderfull
@@ -7,7 +12,7 @@ Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 Mon Jan 23 16:46:20 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gslice.c (slice_config_init): initialize GSlice config from
-	G_SLICE environemtn variable. we support G_SLICE=always-malloc
+	G_SLICE environment variable. we support G_SLICE=always-malloc
 	currently, which forces all g_slice_*() allocations to use the system
 	malloc instead.
 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 482516a42..479202b0a 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Change the shared libary extension for hpux-ia64
+	to so.  (#328253, The Written Word)
+
 Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gutils.c (_g_getenv_nomalloc): wiped out all the wonderfull
@@ -7,7 +12,7 @@ Mon Jan 23 17:30:33 2006  Tim Janik  <timj@imendio.com>
 Mon Jan 23 16:46:20 2006  Tim Janik  <timj@imendio.com>
 
 	* glib/gslice.c (slice_config_init): initialize GSlice config from
-	G_SLICE environemtn variable. we support G_SLICE=always-malloc
+	G_SLICE environment variable. we support G_SLICE=always-malloc
 	currently, which forces all g_slice_*() allocations to use the system
 	malloc instead.
 
diff --git a/configure.in b/configure.in
index aa6da9b7c..f25b277d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1265,7 +1265,14 @@ fi
 AC_MSG_CHECKING(for the suffix of shared libraries)
 case "$host_os" in
   hpux9* | hpux10* | hpux11*)  # taken from ltconfig
-    glib_gmodule_suffix='sl'
+    case "$host_cpu" in
+      hppa*)
+	glib_gmodule_suffix='sl'
+	;;
+      ia64*)
+	glib_gmodule_suffix='so'
+	;;
+    esac
     ;;
   cygwin* | mingw*)
     glib_gmodule_suffix='dll'