diff --git a/mingw-w64-libmariadbclient/PKGBUILD b/mingw-w64-libmariadbclient/PKGBUILD
index ac68d7572a..4b8ff0e296 100644
--- a/mingw-w64-libmariadbclient/PKGBUILD
+++ b/mingw-w64-libmariadbclient/PKGBUILD
@@ -3,38 +3,50 @@
 _realname=libmariadbclient
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
-pkgver=5.5.34
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="MariaDB client libraries (mingw-w64)"
 arch=('any')
 url="http://mariadb.org"
-license=('GPL')
+license=('LGPL')
 makedepends=("${_mingw_suff}-gcc")
-depends=("${_mingw_suff}-crt")
+depends=("${_mingw_suff}-gcc-libs" "${_mingw_suff}-openssl" "${_mingw_suff}-zlib") #"${_mingw_suff}-sqlite3"
 options=('!strip' 'staticlibs')
-source=("http://ftp.osuosl.org/pub/mariadb/mariadb-${pkgver}/win32-packages/mariadb-${pkgver}-win32.zip"
-        "http://ftp.osuosl.org/pub/mariadb/mariadb-${pkgver}/winx64-packages/mariadb-${pkgver}-winx64.zip")
-sha256sums=('f25b8445812d5dc1b43125f70dcad9c957842a6d371d99a35aff5d2e281a76f4'
-            '634eb396a29404dc8677a46c14ef47ab7633345c6f8b6eae06c971840c832308')
+source=("ftp://ftp.osuosl.org/pub/mariadb/client-native-${pkgver}/src/mariadb_client-${pkgver}-src.tar.gz"
+		fix-libnames-mingw.patch)
+sha256sums=('fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60'
+            '5a713fff49bdb7aadebda130d5ea4416a05fb9ebe4b0abe19ef6ecc1b05e2ab6')
+
+prepare() {
+	cd ${srcdir}/mariadb_client-${pkgver}-src
+	patch -p1 -i ${srcdir}/fix-libnames-mingw.patch
+}
 
 build() {
-  cd ${srcdir}
-  
-  case ${MINGW_CHOST} in
-    i686*)
-	  ln -s mariadb-${pkgver}-win32 ${MINGW_CHOST}
-	;;
-	x86_64*)
-	  ln -s mariadb-${pkgver}-winx64 ${MINGW_CHOST}
-	;;
-  esac
-
+	mkdir -p ${pkgdir}${MINGW_PREFIX}
+	pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
+	export PREFIX_WIN=`pwd -W`
+	popd > /dev/null
+	
+	mkdir -p ${srcdir}/${MINGW_CHOST}
+	cd ${srcdir}/${MINGW_CHOST}
+	${MINGW_PREFIX}/bin/cmake \
+		-G "MSYS Makefiles" \
+		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \
+		-DCMAKE_BUILD_TYPE=RELEASE \
+		-DWITH_EXTERNAL_ZLIB=ON \
+		-DWITH_SQLITE=OFF \
+		-DWITH_OPENSSL=ON \
+		../mariadb_client-${pkgver}-src
+	make
 }
 
 package() {
-    cd "${srcdir}/${MINGW_CHOST}"
-    mkdir -p "${pkgdir}${MINGW_PREFIX}/"{bin,include,lib}
-    cp -R include "${pkgdir}${MINGW_PREFIX}"
-    install -Dm644 lib/libmysql.lib "${pkgdir}${MINGW_PREFIX}/lib/libmysql.lib"
-    install -Dm644 lib/libmysql.dll "${pkgdir}${MINGW_PREFIX}/bin/libmysql.dll"
+	cd "${srcdir}/${MINGW_CHOST}"
+	make install
+
+	cp "${pkgdir}${MINGW_PREFIX}"/lib/{libmariadb,libmysqlclient}.dll.a
+	cp "${pkgdir}${MINGW_PREFIX}"/lib/{libmariadb,libmysqlclient_r}.dll.a
+	cp "${pkgdir}${MINGW_PREFIX}"/lib/{libmariadbclient,libmysqlclient}.a
+	cp "${pkgdir}${MINGW_PREFIX}"/lib/{libmariadbclient,libmysqlclient_r}.a
 }
diff --git a/mingw-w64-libmariadbclient/fix-libnames-mingw.patch b/mingw-w64-libmariadbclient/fix-libnames-mingw.patch
new file mode 100644
index 0000000000..74dda3de3a
--- /dev/null
+++ b/mingw-w64-libmariadbclient/fix-libnames-mingw.patch
@@ -0,0 +1,60 @@
+--- mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt.orig	2014-04-04 14:21:01.000000000 +0400
++++ mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt	2014-04-18 12:08:42.907600000 +0400
+@@ -149,31 +149,32 @@
+   TARGET_LINK_LIBRARIES(mariadbclient ${SSL_LIBRARIES})
+ ENDIF()
+ 
+-ADD_LIBRARY(libmariadb SHARED ${LIBMARIADB_SOURCES})
+-TARGET_LINK_LIBRARIES(libmariadb ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
++ADD_LIBRARY(mariadb SHARED ${LIBMARIADB_SOURCES})
++TARGET_LINK_LIBRARIES(mariadb ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
+ 
+ IF(OPENSSL_FOUND)
+-  TARGET_LINK_LIBRARIES(libmariadb ${SSL_LIBRARIES})
++  TARGET_LINK_LIBRARIES(mariadb ${SSL_LIBRARIES})
+ ENDIF()
+ 
+ IF(WIN32)
+-  TARGET_LINK_LIBRARIES(libmariadb ws2_32 advapi32 kernel32)
++  TARGET_LINK_LIBRARIES(mariadb ws2_32 advapi32 kernel32)
+   TARGET_LINK_LIBRARIES(mariadbclient ws2_32 advapi32 kernel32)
+ ELSE()
+-  TARGET_LINK_LIBRARIES(libmariadb m)
++  TARGET_LINK_LIBRARIES(mariadb m)
+   TARGET_LINK_LIBRARIES(mariadbclient m)
+ ENDIF()
+ 
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
+-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/version_script.txt")
++  TARGET_LINK_LIBRARIES (mariadb "-Wl,--no-undefined")
++  TARGET_LINK_LIBRARIES (mariadb "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/version_script.txt")
+ ENDIF()
+ 
+-SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
++SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
+ 
+-SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
++SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION 
+    ${CPACK_PACKAGE_VERSION_MAJOR}
+-   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
++   SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
++   RUNTIME_OUTPUT_NAME libmariadb)
+ 
+ #
+ # Installation
+@@ -209,10 +210,10 @@
+ 
+ 
+ INSTALL(TARGETS
+-          libmariadb mariadbclient
+-          RUNTIME DESTINATION "lib/mariadb"
+-          LIBRARY DESTINATION "lib/mariadb"
+-          ARCHIVE DESTINATION "lib/mariadb")
++          mariadb mariadbclient
++          RUNTIME DESTINATION "bin"
++          LIBRARY DESTINATION "lib"
++          ARCHIVE DESTINATION "lib")
+ IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
+   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"