diff --git a/Makefile.in b/Makefile.in
index af85e87..b77077c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -198,15 +198,15 @@ $(_VERSION_): .config.h
 
 dll/dummy:
 
-dll: .config.h $(srcdir)/Makefile dll/Makefile dll/dummy
+dll: .config.h Makefile dll/Makefile dll/dummy
 	cd dll \
 	  && $(MAKE) all
 
-installdll: $(srcdir)/Makefile dll/Makefile installdirs dll
+installdll: Makefile dll/Makefile installdirs dll
 	cd dll \
 	  && $(MAKE) 'DESTDIR=$(DESTDIR)' install
 
-installdll_local: $(srcdir)/Makefile dll/Makefile
+installdll_local: Makefile dll/Makefile
 	cd dll \
 	  && $(MAKE) 'PLUGINDIR=$(local_dir)/.BitchX/plugins'
 
@@ -237,11 +237,11 @@ install_local: all local_installdirs installdll_local
 	$(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_QUIT_FILE)
 	$(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_KICK_FILE)
 
-wserv: .config.h $(srcdir)/source/wserv.c $(srcdir)/source/term.c $(srcdir)/Makefile
+wserv: .config.h $(srcdir)/source/wserv.c $(srcdir)/source/term.c Makefile
 	cd source \
 	  && $(MAKE) wserv
 
-scr-bx: .config.h $(srcdir)/source/scr-bx.c $(srcdir)/source/term.c $(srcdir)/Makefile
+scr-bx: .config.h $(srcdir)/source/scr-bx.c $(srcdir)/source/term.c Makefile
 	cd source \
 	  && $(MAKE) scr-bx
 
@@ -297,7 +297,7 @@ local_installdirs:
 
 config: bxconf
 
-bxconf: $(srcdir)/Makefile $(srcdir)/bx-conf/Makefile.in
+bxconf: Makefile $(srcdir)/bx-conf/Makefile.in
 	cd bx-conf \
 	  && $(MAKE) all
 	$(topdir)/bxconfigure || :
diff --git a/configure.in b/configure.in
index a9a292c..e379601 100644
--- a/configure.in
+++ b/configure.in
@@ -1013,7 +1013,7 @@ GZIP_ENV="--best"
 BZIP2="-9 --repetitive-best"
 
 dnl Should I keep this or not?
-if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
+if test -n "$EMXOS2" -o -n "$MINGWIN32"; then
   bindir="\$(IRCLIB)"
   INSTALL_IRC="\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT)"
   IRCLIB="\${prefix}/BitchX"
diff --git a/configure.in.rej b/configure.in.rej
new file mode 100644
index 0000000..a5d6aa1
--- /dev/null
+++ b/configure.in.rej
@@ -0,0 +1,11 @@
+--- /BitchX1.3/configure.in	2012-12-31 22:55:05.000000000 -0600
++++ BitchX1.3/configure.in	2013-01-09 04:55:24.729164000 -0600
+@@ -1013,7 +1013,7 @@
+ BZIP2="-9 --repetitive-best"
+ 
+ dnl Should I keep this or not?
+-if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
++if test -n "$EMXOS2" -o -n "$MINGWIN32"; then
+   bindir="\$(IRCLIB)"
+   INSTALL_IRC="\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT)"
+   IRCLIB="\${prefix}/BitchX"
diff --git a/dll/europa/europa.c b/dll/europa/europa.c
index 9b1c12c..3490b3e 100644
--- a/dll/europa/europa.c
+++ b/dll/europa/europa.c
@@ -357,7 +357,7 @@ int Europa_Init(IrcCommandDll **intp, Function_ptr *global_table) {
   put_it("** Europa v%s connecting to database backend...", MOD_VERSION);
 
   /* connect to the database server */
-  if(!(mysql_connect(&mysql, DBHOST, DBUSER, DBPASSWD))) {
+  if(!(mysql_real_connect(&mysql, DBHOST, DBUSER, DBPASSWD, NULL, 0, NULL, 0))) {
     put_it("** Server refused login/password.");
     return 0;
   }
diff --git a/macros/pluginsupport.m4 b/macros/pluginsupport.m4
index c8c5c3b..d889fcf 100644
--- a/macros/pluginsupport.m4
+++ b/macros/pluginsupport.m4
@@ -148,7 +148,7 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT,
         ;;
       CYGWIN*)
         SHLIB_SUFFIX=".dll"
-        SHLIB_LD="dllwrap --export-all --output-def \$(PLUGIN_NAME).def --implib lib\$(PLUGIN_NAME).a --driver-name \$(CC)"
+        SHLIB_LD="$CC -shared"
         ;;
       OS/2*)
         SHLIB_SUFFIX=".dll"