diff --git a/ChangeLog b/ChangeLog
index 48d06ffeb..badbe3422 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 $Source$
 
 
+2006-07-18 Michal Čihař  <michal@cihar.com>
+    * libraries/common.lib.php: Fix extension loading on HP-UX (bug #1524776),
+      thanks to Francois Laupretre - flp1.
+
 2006-07-17 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/dbi/mysql.dbi.lib.php: 
       bug #1523623, BIGINT auto_increment and mysql extension
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 8aaa45d35..c4ee97e9c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -432,8 +432,11 @@ function PMA_dl($module)
         return false;
     }
 
+    /* Once we require PHP >= 4.3, we might use PHP_SHLIB_SUFFIX here */
     if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
         $module_file = 'php_' . $module . '.dll';
+    } elseif (PHP_OS=='HP-UX') {
+        $module_file = $module . '.sl';
     } else {
         $module_file = $module . '.so';
     }