diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
--- a/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2010-1-31
-    1.8.1: uses updated exception handling of hsql-1.8.1; refactorings
diff --git a/Database/HSQL/HsMySQL.h b/Database/HSQL/HsMySQL.h
deleted file mode 100644
--- a/Database/HSQL/HsMySQL.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef HsMySQL
-#define HsMySQL
-
-#ifdef mingw32_HOST_OS
-#include <windows.h>
-#endif
-
-#include <mysql.h>
-
-#ifdef CLIENT_MULTI_STATEMENTS
-#define MYSQL_DEFAULT_CONNECT_FLAGS  CLIENT_MULTI_STATEMENTS
-#else
-#define MYSQL_DEFAULT_CONNECT_FLAGS  0
-#endif
-
-#endif
diff --git a/hsql-mysql.cabal b/hsql-mysql.cabal
--- a/hsql-mysql.cabal
+++ b/hsql-mysql.cabal
@@ -1,17 +1,17 @@
-Name: hsql-mysql 
-Version: 1.8.2
+Name: hsql-mysql
+Version: 1.8.3
 Cabal-Version: >=1.10
 Build-Type: Simple
-License: BSD3 
+License: BSD3
 License-File: LICENSE
-Author: Krasimir Angelov <kr.a...@gmail.com> 
+Author: Krasimir Angelov <kr.a...@gmail.com>
 Maintainer: Chris Done <chrisdone@gmail.com>
-Category: Database 
+Category: Database
 Synopsis: MySQL driver for HSQL.
 Description: MySQL driver for HSQL.
 
 Library {
-  Build-Depends: base >=4 && < 5, hsql >= 1.8.2, Cabal 
+  Build-Depends: base >=4 && < 5, hsql >= 1.8.2, Cabal
   Exposed-Modules: Database.HSQL.MySQL
                    DB.HSQL.MySQL.Type
                    DB.HSQL.MySQL.Functions
@@ -19,16 +19,20 @@
   Other-Modules:
   Hs-Source-Dirs: .
   Default-Extensions:
-  Other-Extensions: CPP, DeriveDataTypeable, FlexibleInstances, 
+  Other-Extensions: CPP, DeriveDataTypeable, FlexibleInstances,
                     ForeignFunctionInterface, RankNTypes, ScopedTypeVariables
   Buildable: True
   GHC-Options: -O2
-  Includes: Database/HSQL/HsMySQL.h 
+  Includes: Database/HSQL/HsMySQL.h
   Install-Includes:
-  Include-Dirs: Database/HSQL, /usr/include/mysql 
   C-Sources:
-  Extra-Libraries: mysqlclient
-  Extra-Lib-Dirs: /usr/lib,/usr/lib/mysql 
+  if os(mingw32) || os(win32)
+    Include-Dirs: Database/HSQL
+    Extra-Libraries: libmysql
+  else
+    Include-Dirs: Database/HSQL, /usr/include/mysql
+    Extra-Libraries: mysqlclient
+    Extra-Lib-Dirs: /usr/lib,/usr/lib/mysql
   CC-Options:
   LD-Options:
   PkgConfig-Depends: