diff --git a/cloog/PKGBUILD b/cloog/PKGBUILD
index 4a247d3e..d0c55d2d 100644
--- a/cloog/PKGBUILD
+++ b/cloog/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=('cloog' 'cloog-devel')
-pkgver=0.18.3
+pkgver=0.18.4
 pkgrel=1
 groups=('libraries')
 pkgdesc="Library that generates loops for scanning polyhedra"
@@ -12,16 +12,16 @@ license=('GPL')
 depends=('isl')
 makedepends=('isl-devel')
 source=(http://www.bastoul.net/cloog/pages/download/${pkgname}-${pkgver}.tar.gz
-        cloog-0.18.0-msys2.patch
-        cloog-0.18.3-no-undefined.patch)
-sha256sums=('460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734'
-            '02a736f3f93edbce4c8d9d98f51fd4267d699395a9f85f3ca870f091edfc09e6'
-            '1b04e9dcab90a28e507b5f1c68677c9110d4cc15f600eacd1d76f670aecf4d39')
+        cloog-0.18.4-msys2.patch
+        cloog-0.18.4-no-undefined.patch)
+sha256sums=('325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e'
+            'fc4c552e4ce633f4f99bb7f4b59078ee1edd89728f66d044b314a2ffff88c552'
+            '8233e5cf165bbe3aab553b560b48128d059e879398274b9c847888119c469a31')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/cloog-0.18.0-msys2.patch
-  patch -p1 -i ${srcdir}/cloog-0.18.3-no-undefined.patch
+  patch -p1 -i ${srcdir}/cloog-0.18.4-msys2.patch
+  patch -p1 -i ${srcdir}/cloog-0.18.4-no-undefined.patch
 
   WANT_AUTOMAKE=latest autoreconf -fiv
 }
diff --git a/cloog/cloog-0.18.0-msys2.patch b/cloog/cloog-0.18.0-msys2.patch
deleted file mode 100644
index 45d4efbd..00000000
--- a/cloog/cloog-0.18.0-msys2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur cloog-0.18.0-orig/autoconf/config.guess cloog-0.18.0/autoconf/config.guess
---- cloog-0.18.0-orig/autoconf/config.guess	2012-12-20 17:22:52.000000000 +0000
-+++ cloog-0.18.0/autoconf/config.guess	2013-04-16 18:37:43.436523400 +0000
-@@ -844,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur cloog-0.18.0-orig/osl/autoconf/config.guess cloog-0.18.0/osl/autoconf/config.guess
---- cloog-0.18.0-orig/osl/autoconf/config.guess	2012-12-20 17:22:49.000000000 +0000
-+++ cloog-0.18.0/osl/autoconf/config.guess	2013-04-16 19:16:28.498046900 +0000
-@@ -844,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
diff --git a/cloog/cloog-0.18.4-msys2.patch b/cloog/cloog-0.18.4-msys2.patch
new file mode 100644
index 00000000..92a1e370
--- /dev/null
+++ b/cloog/cloog-0.18.4-msys2.patch
@@ -0,0 +1,26 @@
+diff -durN cloog-0.18.4.orig/autoconf/config.guess cloog-0.18.4/autoconf/config.guess
+--- cloog-0.18.4.orig/autoconf/config.guess	2014-10-02 22:14:47.000000000 +0800
++++ cloog-0.18.4/autoconf/config.guess	2017-05-09 15:47:33.312500000 +0800
+@@ -866,6 +866,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	echo x86_64-unknown-msys
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit ;;
+diff -durN cloog-0.18.4.orig/osl/autoconf/config.guess cloog-0.18.4/osl/autoconf/config.guess
+--- cloog-0.18.4.orig/osl/autoconf/config.guess	2014-10-02 22:14:44.000000000 +0800
++++ cloog-0.18.4/osl/autoconf/config.guess	2017-05-09 15:48:21.156250000 +0800
+@@ -866,6 +866,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	echo x86_64-unknown-msys
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit ;;
diff --git a/cloog/cloog-0.18.3-no-undefined.patch b/cloog/cloog-0.18.4-no-undefined.patch
similarity index 59%
rename from cloog/cloog-0.18.3-no-undefined.patch
rename to cloog/cloog-0.18.4-no-undefined.patch
index 6e7b7594..afeaea40 100644
--- a/cloog/cloog-0.18.3-no-undefined.patch
+++ b/cloog/cloog-0.18.4-no-undefined.patch
@@ -1,27 +1,6 @@
---- cloog-0.18.3/Makefile.am.orig	2013-10-16 21:08:32.616800000 +0400
-+++ cloog-0.18.3/Makefile.am	2013-10-11 11:27:03.000000000 +0400
-@@ -90,7 +90,7 @@
- AM_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
- AM_CFLAGS = $(CFLAGS_WARN)
- libcloog_isl_la_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include @ISL_CPPFLAGS@ @OSL_CPPFLAGS@
--libcloog_isl_la_LDFLAGS = -version-info @versioninfo@ \
-+libcloog_isl_la_LDFLAGS = -version-info @versioninfo@ -no-undefined \
- 	-rpath $(libdir) @ISL_LDFLAGS@ @OSL_LDFLAGS@
- libcloog_isl_la_LIBADD = @ISL_LIBS@ @OSL_LIBS@ $(ISL_LA) $(OSL_LA)
- libcloog_isl_la_SOURCES = \
---- cloog-0.18.3/isl/Makefile.am.orig	2013-10-16 21:09:33.160400000 +0400
-+++ cloog-0.18.3/isl/Makefile.am	2013-10-11 11:27:21.000000000 +0400
-@@ -154,7 +154,7 @@
- 	isl_vertices_private.h \
- 	isl_vertices.c
- libisl_la_LIBADD = @MP_LIBS@
--libisl_la_LDFLAGS = -version-info @versioninfo@ \
-+libisl_la_LDFLAGS = -version-info @versioninfo@ -no-undefined \
- 	@MP_LDFLAGS@
- 
- isl_test_LDFLAGS = @MP_LDFLAGS@
---- cloog-0.18.3/isl/configure.ac.orig	2013-10-16 21:09:33.160400000 +0400
-+++ cloog-0.18.3/isl/configure.ac	2013-10-11 11:27:21.000000000 +0400
+diff -durN cloog-0.18.4.orig/isl/configure.ac cloog-0.18.4/isl/configure.ac
+--- cloog-0.18.4.orig/isl/configure.ac	2017-05-09 15:24:43.125000000 +0800
++++ cloog-0.18.4/isl/configure.ac	2017-05-09 15:55:57.921875000 +0800
 @@ -222,9 +222,6 @@
  AC_CONFIG_HEADERS(isl_config.h)
  AC_CONFIG_FILES(Makefile)
@@ -32,3 +11,27 @@
  AC_CONFIG_FILES([bound_test.sh], [chmod +x bound_test.sh])
  AC_CONFIG_FILES([codegen_test.sh], [chmod +x codegen_test.sh])
  AC_CONFIG_FILES([pip_test.sh], [chmod +x pip_test.sh])
+diff -durN cloog-0.18.4.orig/isl/Makefile.am cloog-0.18.4/isl/Makefile.am
+--- cloog-0.18.4.orig/isl/Makefile.am	2017-05-09 15:24:41.765625000 +0800
++++ cloog-0.18.4/isl/Makefile.am	2017-05-09 15:55:12.468750000 +0800
+@@ -172,7 +172,7 @@
+ 	isl_vertices.c \
+ 	isl_yaml.h
+ libisl_la_LIBADD = @MP_LIBS@
+-libisl_la_LDFLAGS = -version-info @versioninfo@ \
++libisl_la_LDFLAGS = -version-info @versioninfo@ -no-undefined \
+ 	@MP_LDFLAGS@
+ 
+ isl_test_LDFLAGS = @MP_LDFLAGS@
+diff -durN cloog-0.18.4.orig/Makefile.am cloog-0.18.4/Makefile.am
+--- cloog-0.18.4.orig/Makefile.am	2017-05-09 15:24:36.093750000 +0800
++++ cloog-0.18.4/Makefile.am	2017-05-09 15:54:16.468750000 +0800
+@@ -92,7 +92,7 @@
+ AM_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+ AM_CFLAGS = $(CFLAGS_WARN)
+ libcloog_isl_la_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include @ISL_CPPFLAGS@ @OSL_CPPFLAGS@
+-libcloog_isl_la_LDFLAGS = -version-info @versioninfo@ \
++libcloog_isl_la_LDFLAGS = -version-info @versioninfo@ -no-undefined \
+ 	-rpath $(libdir) @ISL_LDFLAGS@ @OSL_LDFLAGS@
+ libcloog_isl_la_LIBADD = @ISL_LIBS@ @OSL_LIBS@ $(ISL_LA) $(OSL_LA)
+ libcloog_isl_la_SOURCES = \