diff --git a/common/shlibs b/common/shlibs
index f7c9d4e43de..88bdef8c449 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1018,7 +1018,7 @@ libsratom-0.so.0 sratom-0.4.0_1
 libmongoose.so.0 libmongoose-3.1_1
 libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
-libcloog-isl.so.3 cloog-0.17.0_1
+libcloog-isl.so.4 cloog-0.18.1_1
 librtmp.so.0 librtmp-2.4_1
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 25edaa974ca..ff4129246ab 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -1,21 +1,17 @@
 # Template file for 'cloog'
 pkgname=cloog
-version=0.17.0
-revision=3
+version=0.18.1
+revision=1
 build_style=gnu-configure
-configure_args="--with-isl=system --with-gmp=system"
-makedepends="gmp-devel isl-devel"
+configure_args="--with-isl=system --with-gmp=system --with-gmp-exec-prefix=${XBPS_CROSS_BASE}"
+makedepends="isl-devel"
 replaces="cloog-ppl>=0"
 short_desc="Library that generates loops for scanning polyhedra"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bastoul.net/cloog/"
 license="GPL-2"
 distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz"
-checksum=f265f5069830c03d2919a7673c0963495437d6d79a8cbd3474cde2d4e3291e04
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --with-gmp-exec-prefix=$XBPS_CROSS_BASE"
-fi
+checksum=02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196
 
 cloog-devel_package() {
 	depends="gmp-devel cloog>=${version}"
@@ -24,6 +20,9 @@ cloog-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/cloog-isl
+		vmove usr/lib/isl
 	}
 }