diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index ff287d2814..3fbb9872fa 100755
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -1035,8 +1035,10 @@ function inst_libdbi() {
         wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/libdbi-0*
         qpushd $TMP_UDIR/libdbi-0*
-            [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ] && \
-                patch -p0 < $LIBDBI_PATCH
+            if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
+                patch -p1 < $LIBDBI_PATCH
+                ./autogen.sh
+            fi
             ./configure ${HOST_XCOMPILE} \
                 --disable-docs \
                 --prefix=${_LIBDBI_UDIR}
diff --git a/packaging/win32/libdbi-0.8.3.patch b/packaging/win32/libdbi-0.8.3.patch
index 5e65867189..8f982ae192 100755
--- a/packaging/win32/libdbi-0.8.3.patch
+++ b/packaging/win32/libdbi-0.8.3.patch
@@ -1,26 +1,32 @@
-Index: dbd.h
-===================================================================
-RCS file: /cvsroot/libdbi/libdbi/include/dbi/dbd.h,v
-retrieving revision 1.29
-diff -u -r1.29 dbd.h
---- include/dbi/dbd.h	15 Aug 2005 19:18:18 -0000	1.29
-+++ include/dbi/dbd.h	16 Aug 2008 20:20:33 -0000
-@@ -52,7 +52,7 @@
- size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
- size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
- const char *dbd_select_db(dbi_conn_t *conn, const char *db);
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
- unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
- unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
- int dbd_ping(dbi_conn_t *conn);
-@@ -63,7 +63,7 @@
- void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
- dbi_row_t *_dbd_row_allocate(unsigned int numfields);
- void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
--void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
-+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
- dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
- void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
- void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
-
+diff -Nur libdbi-0.8.3-old/configure.in libdbi-0.8.3/configure.in
+--- libdbi-0.8.3-old/configure.in	2008-02-06 17:03:27.000000000 +0100
++++ libdbi-0.8.3/configure.in	2008-10-05 15:56:55.677983028 +0200
+@@ -26,6 +26,7 @@
+ AC_PROG_CPP
+ AC_PROG_LD
+ AC_PROG_INSTALL
++AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL)
+ dnl ====================================
+diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
+--- libdbi-0.8.3-old/include/dbi/dbd.h	2005-08-15 21:18:18.000000000 +0200
++++ libdbi-0.8.3/include/dbi/dbd.h	2008-10-05 15:57:24.889982668 +0200
+@@ -52,7 +52,7 @@
+ size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
+ size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
+ const char *dbd_select_db(dbi_conn_t *conn, const char *db);
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
+ unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
+ unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
+ int dbd_ping(dbi_conn_t *conn);
+@@ -63,7 +63,7 @@
+ void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
+ dbi_row_t *_dbd_row_allocate(unsigned int numfields);
+ void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
+ dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
+ void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
+ void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);