diff -Naur php-5.2.3/ext/mssql/config.m4 php-5.2.3.oden/ext/mssql/config.m4
--- php-5.2.3/ext/mssql/config.m4	2005-10-10 12:28:53.000000000 +0200
+++ php-5.2.3.oden/ext/mssql/config.m4	2007-06-10 14:55:24.000000000 +0200
@@ -14,9 +14,9 @@
         FREETDS_INSTALLATION_DIR=$i
         FREETDS_INCLUDE_DIR=$i/include
         break
-      elif test -f $i/include/freetds/tds.h; then
+      elif test -f $i/include/freetds_mssql/tds.h; then
         FREETDS_INSTALLATION_DIR=$i
-        FREETDS_INCLUDE_DIR=$i/include/freetds
+        FREETDS_INCLUDE_DIR=$i/include/freetds_mssql
         break
       fi
     done
@@ -30,20 +30,20 @@
     if test -f $PHP_MSSQL/include/tds.h; then
       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
-    elif test -f $PHP_MSSQL/include/freetds/tds.h; then
+    elif test -f $PHP_MSSQL/include/freetds_mssql/tds.h; then
       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
+      FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds_mssql
     else
       AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
     fi
   fi  
 
-  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
+  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.so"; then
+     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.[a|so])
   fi
 
   PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, MSSQL_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(sybdb_mssql, $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, MSSQL_SHARED_LIBADD)
 
   PHP_NEW_EXTENSION(mssql, php_mssql.c, $ext_shared)
   AC_CHECK_LIB(dnet_stub, dnet_addr,
diff -Naur php-5.2.3/ext/pdo_dblib/config.m4 php-5.2.3.oden/ext/pdo_dblib/config.m4
--- php-5.2.3/ext/pdo_dblib/config.m4	2005-11-01 14:12:52.000000000 +0100
+++ php-5.2.3.oden/ext/pdo_dblib/config.m4	2007-06-10 14:57:46.000000000 +0200
@@ -17,9 +17,9 @@
         PDO_FREETDS_INSTALLATION_DIR=$i
         PDO_FREETDS_INCLUDE_DIR=$i/include
         break
-      elif test -f $i/include/freetds/tds.h; then
+      elif test -f $i/include/freetds_mssql/tds.h; then
         PDO_FREETDS_INSTALLATION_DIR=$i
-        PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+        PDO_FREETDS_INCLUDE_DIR=$i/include/freetds_mssql
         break;
       fi
     done
@@ -33,9 +33,9 @@
     if test -f $PHP_PDO_DBLIB/include/tds.h; then
       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
-    elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
+    elif test -f $PHP_PDO_DBLIB/include/freetds_mssql/tds.h; then
       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
+      PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds_mssql
     else
       AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory)
     fi
@@ -45,12 +45,12 @@
     PHP_LIBDIR=lib
   fi
 
-  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
-     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
+  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.so"; then
+     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds_mssql.[a|so])
   fi
 
   PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(sybdb_mssql, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
 
   ifdef([PHP_CHECK_PDO_INCLUDES],
   [