diff --git a/CHANGES b/CHANGES
index 99528b2e5db3d2a473ed74e6b4901ffc64bf9763..2ef647fd73761e5c24ed33c200b55305b44198c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -164,6 +164,11 @@ o SSL.File
   This in turn caused errors like "Not open" from
   functions like read() and set_nonblocking().
 
+o sybase
+
+  The module's configure script now respects ABI suffixes when searching
+  for the sybase library dir.
+
 o Thread.Queue
 
   Attempt to work around glibc bugs.
diff --git a/src/modules/sybase/configure.in b/src/modules/sybase/configure.in
index 38441bb77cf94a0a52fb7d3a338a91ff2eb0d3c8..4846ae3723416a6c6ecc1815af1bd51b71ad96d5 100755
--- a/src/modules/sybase/configure.in
+++ b/src/modules/sybase/configure.in
@@ -101,7 +101,6 @@ else
 fi
 
 if test "$pike_cv_framework_sybaseopenclient" = "no"; then
-AC_MSG_CHECKING(for library files location)
 if test x$pike_sybase_lib_dir != x; then
     AC_MSG_RESULT(user-provided: $pike_sybase_lib_dir)
     pike_cv_sybase_lib_dir=$pike_sybase_lib_dir
@@ -117,13 +116,17 @@ else
             for sybpath in $pike_sybase_reasonable_paths
             do
 dnl                AC_MSG_CHECKING(in $sybroot/$sybprefix/$sybpath)
-                for syblib in $pike_sybase_reasonable_libs_tosearch
-                do
-                    if test -f $sybroot/$sybprefix/$sybpath/$syblib; then
-                        pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath"
-dnl                        AC_MSG_RESULT(found)
-                        break 4;
-                    fi
+                for suff in $pike_cv_abi_suffixes; do
+                    PIKE_CHECK_ABI_DIR($sybroot/$sybprefix/$sybpath$suff, [
+                        for syblib in $pike_sybase_reasonable_libs_tosearch
+                        do
+                            if test -f $sybroot/$sybprefix/$sybpath$suff/$syblib; then
+                                pike_cv_sybase_lib_dir="$sybroot/$sybprefix/$sybpath$suff"
+        dnl                        AC_MSG_RESULT(found)
+                                break 5;
+                            fi
+                        done
+                    ])
                 done
 dnl            AC_MSG_RESULT(not found)
             done
@@ -131,6 +134,8 @@ dnl            AC_MSG_RESULT(not found)
     done
     ])
 
+  AC_MSG_CHECKING(for library files location)
+
   if test x$pike_cv_sybase_lib_dir != x; then
     AC_MSG_RESULT(found: $pike_cv_sybase_lib_dir)
     LDFLAGS="-L$pike_cv_sybase_lib_dir $LDFLAGS"