diff --git a/mingw-w64-fluidsynth/0001-10-ftbfs-bug-690006.all.patch b/mingw-w64-fluidsynth/0001-10-ftbfs-bug-690006.all.patch
deleted file mode 100644
index b7157fcd85..0000000000
--- a/mingw-w64-fluidsynth/0001-10-ftbfs-bug-690006.all.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Christoph Egger <christoph@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690006
-Description: Revert broken patch from release 1.1.6
-
-diff --git a/src/drivers/fluid_oss.c b/src/drivers/fluid_oss.c
-index 840dad1..40761db 100644
---- a/src/drivers/fluid_oss.c
-+++ b/src/drivers/fluid_oss.c
-@@ -45,7 +45,7 @@
- #define BUFFER_LENGTH 512
- 
- // Build issue on some systems (OSS 4.0)?
--#ifdef SNDCTL_DSP_CHANNELS
-+#ifndef SOUND_PCM_WRITE_CHANNELS
-   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
- #endif
diff --git a/mingw-w64-fluidsynth/0002-1001-revert_abi_break_114.all.patch b/mingw-w64-fluidsynth/0002-1001-revert_abi_break_114.all.patch
deleted file mode 100644
index b2e4c854ae..0000000000
--- a/mingw-w64-fluidsynth/0002-1001-revert_abi_break_114.all.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Revert ABI break introduced with FluidSynth 1.1.4.
-Origin: upstream, commit:428
----
- src/sfloader/fluid_defsfont.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- fluidsynth.orig/src/sfloader/fluid_defsfont.h
-+++ fluidsynth/src/sfloader/fluid_defsfont.h
-@@ -421,7 +421,7 @@ int fluid_defsfont_iteration_next(fluid_
- int fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont);
- int fluid_defsfont_add_sample(fluid_defsfont_t* sfont, fluid_sample_t* sample);
- int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset);
--
-+fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s);
- 
- /*
-  * fluid_preset_t
diff --git a/mingw-w64-fluidsynth/0003-include-blddir.all.patch b/mingw-w64-fluidsynth/0003-include-blddir.all.patch
deleted file mode 100644
index f19aab391e..0000000000
--- a/mingw-w64-fluidsynth/0003-include-blddir.all.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fluidsynth-1.1.6/src/Makefile.am.orig	2012-08-16 04:01:13.000000000 +0000
-+++ fluidsynth-1.1.6/src/Makefile.am	2014-02-10 04:29:46.259284600 +0000
-@@ -173,6 +173,7 @@
-   -I$(top_srcdir)/src/utils \
-   -I$(top_srcdir)/src/sfloader \
-   -I$(top_srcdir)/src/bindings \
-+  -I$(top_builddir)/include \
-   $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
-   $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
-   $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS) \
diff --git a/mingw-w64-fluidsynth/0004-disable-rtkit-bindings-on-w32.all.patch b/mingw-w64-fluidsynth/0004-disable-rtkit-bindings-on-w32.all.patch
deleted file mode 100644
index f78bcc5336..0000000000
--- a/mingw-w64-fluidsynth/0004-disable-rtkit-bindings-on-w32.all.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- fluidsynth-1.1.6/src/bindings/fluid_rtkit.c.orig	2012-08-16 04:01:13.000000000 +0000
-+++ fluidsynth-1.1.6/src/bindings/fluid_rtkit.c	2014-03-22 12:43:34.079336600 +0000
-@@ -27,7 +27,8 @@
- 
- #include "fluidsynth_priv.h"
- 
--#ifdef DBUS_SUPPORT
-+/* This code is never used on W32 */
-+#if defined(DBUS_SUPPORT) && !defined(_WIN32)
- 
- #include <errno.h>
- 
-@@ -292,8 +293,6 @@
-         return ret;
- }
- 
--#else
--
- int rtkit_make_realtime(DBusConnection *connection, pid_t thread, int priority) {
-         return -ENOTSUP;
- }
-@@ -347,7 +346,7 @@
- 		return res;
- 	}
-         dbus_error_free(&error);
--	
-+
- 	/* Make sure we don't fail by wanting too much */
- 	max_prio = rtkit_get_max_realtime_priority(conn);
- 	if (max_prio < 0) 
-@@ -372,7 +371,6 @@
- 		setrlimit(RLIMIT_RTTIME, &old_limit);
- 	}
- 	MAKE_REALTIME_RETURN(res);
--	
- }
- 
- #endif
diff --git a/mingw-w64-fluidsynth/PKGBUILD b/mingw-w64-fluidsynth/PKGBUILD
index 6d16d9f4db..6a5faaa333 100644
--- a/mingw-w64-fluidsynth/PKGBUILD
+++ b/mingw-w64-fluidsynth/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=fluidsynth
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.1.6
-pkgrel=3
+pkgver=1.1.8
+pkgrel=1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications (mingw-w64)"
 arch=('any')
 url="http://www.fluidsynth.org/"
@@ -14,49 +14,46 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libsndfile"
          "${MINGW_PACKAGE_PREFIX}-portaudio")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-nasm"
-             "${MINGW_PACKAGE_PREFIX}-libtool")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "${MINGW_PACKAGE_PREFIX}-libtool"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 options=('strip' 'staticlibs')
-source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
-        0001-10-ftbfs-bug-690006.all.patch
-        0002-1001-revert_abi_break_114.all.patch
-        0003-include-blddir.all.patch
-        0004-disable-rtkit-bindings-on-w32.all.patch)
-sha256sums=('50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c'
-            '42c1a73052776c530060817702a0245aee1a1bb33be4c329e1bf150959e664ae'
-            '31892883cdbf8f5984e1f62906eac49d2b2e9176eb3c049efbcc7ecd47a1be9a'
-            '84e23c61efe2a34409cbc2b417988ade926d6881d46efccc92fcc05f2287050d'
-            '21cca1fb71459611f422bd71fc58ca4dd0fffcf03cbe86e9e90b5d76025f2363')
+source=("https://github.com/FluidSynth/${_realname}/archive/v${pkgver}.tar.gz"
+        "fluidsynth_cmake_win32_output_name.patch")
+sha256sums=('318df5aebde8e7353c8878f5c9cb3ba8ed578c2607978b6fbfc5f1cb2ad9d799'
+            'afc37cf2d19725d7ec07c5d90b4247f16c672fe168f53dfffb5a72a1da65eecb')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i ${srcdir}/0001-10-ftbfs-bug-690006.all.patch
-  patch -p1 -i ${srcdir}/0002-1001-revert_abi_break_114.all.patch
-  patch -p1 -i ${srcdir}/0003-include-blddir.all.patch
-  patch -p1 -i ${srcdir}/0004-disable-rtkit-bindings-on-w32.all.patch
-
-  ./autogen.sh
+  cd "$srcdir"/${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/fluidsynth_cmake_win32_output_name.patch
 }
 
 build() {
-  export lt_cv_deplibs_check_method='pass_all'
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  ../${_realname}-${pkgver}/configure \
-    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --without-readline \
-    --enable-shared \
-    --enable-static \
-    STRIP=true CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" PTHREAD_LIBS=-lpthread
+  cd "$srcdir"/${_realname}-${pkgver}
+  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    ${MINGW_PREFIX}/bin/cmake \
+      -G'MSYS Makefiles' \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      "${extra_config[@]}" \
+      -DBUILD_SHARED_LIBS=ON \
+      -Denable-portaudio=ON \
+      -Denable-dbus=OFF \
+      ../${_realname}-${pkgver}
 
   make
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build-${CARCH}
+  make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-fluidsynth/fluidsynth_cmake_win32_output_name.patch b/mingw-w64-fluidsynth/fluidsynth_cmake_win32_output_name.patch
new file mode 100644
index 0000000000..0592b02915
--- /dev/null
+++ b/mingw-w64-fluidsynth/fluidsynth_cmake_win32_output_name.patch
@@ -0,0 +1,19 @@
+diff -Naru fluidsynth-1.1.8/src/CMakeLists.txt fluidsynth-1.1.8.FG/src/CMakeLists.txt
+--- fluidsynth-1.1.8/src/CMakeLists.txt	2017-10-12 17:32:26 +0200
++++ fluidsynth-1.1.8.FG/src/CMakeLists.txt	2017-10-23 09:57:36 +0200
+@@ -270,6 +270,15 @@
+         VERSION ${LIB_VERSION_INFO}
+         SOVERSION ${LIB_VERSION_CURRENT}
+     )
++elseif ( WIN32 )
++  set_target_properties ( libfluidsynth
++    PROPERTIES
++      ARCHIVE_OUTPUT_NAME "fluidsynth"
++      PREFIX "lib"
++      OUTPUT_NAME "fluidsynth-${LIB_VERSION_CURRENT}"
++      VERSION ${LIB_VERSION_INFO}
++      SOVERSION ${LIB_VERSION_CURRENT}
++    )
+ else ( MACOSX_FRAMEWORK )
+   set_target_properties ( libfluidsynth
+     PROPERTIES