diff --git a/configure.ac b/configure.ac
index abadcec..d7cdd1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,16 @@ if test "${build}" != "${host}" -a "${PKG_CONFIG_LIBDIR}" = ""; then
   export PKG_CONFIG_LIBDIR=/dev/null
 fi
 
+AC_MSG_CHECKING(for library suffix)
+LT_SUFFIX="`./libtool -n --mode=link gcc -o libTEST.la -version-number 123:666:999 -rpath / | xargs -n 1 | sed -ne 's/.*libTEST\(@<:@^, ()0-9@:>@*\)123\(@<:@^, ()0-9@:>@*\).*/\1'$LT_MAJOR'\2/p' | grep -v '\.$' | head -n 1`"
+if test "$LT_SUFFIX" = ""; then
+  LT_SUFFIX=".so.$LT_MAJOR"
+  AC_MSG_RESULT(unknown, defaulting to $LT_SUFFIX)
+else
+  AC_MSG_RESULT($LT_SUFFIX)
+fi
+AC_SUBST(LT_SUFFIX)
+
 AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h)
 
 ac_cv_have_getopt_long="no"
diff --git a/pipi-sharp/pipi-sharp.dll.config b/pipi-sharp/pipi-sharp.dll.config
deleted file mode 100644
index baf33c7..0000000
--- a/pipi-sharp/pipi-sharp.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.0" />
-    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.0.dylib" />    
-</configuration>
diff --git a/pipi-sharp/pipi-sharp.dll.config.in b/pipi-sharp/pipi-sharp.dll.config.in
index 9e302f8..4d0e2ee 100644
--- a/pipi-sharp/pipi-sharp.dll.config.in
+++ b/pipi-sharp/pipi-sharp.dll.config.in
@@ -1,3 +1,3 @@
 <configuration>
-    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.@LT_MAJOR@" />
+    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi@LT_SUFFIX@" />
 </configuration>