diff --git a/common/shlibs b/common/shlibs
index 479bd386f9..fa049bb1b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -76,7 +76,6 @@ libmudflap.so.0 libmudflap-4.4.0_1
 libmudflapth.so.0 libmudflap-4.4.0_1
 libgomp.so.1 libgomp-4.4.0_1
 libmagic.so.1 file-4.90_1
-libcloog.so.0 cloog-ppl-0.15.7_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
@@ -973,3 +972,4 @@ libsratom-0.so.0 sratom-0.2.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
diff --git a/srcpkgs/cloog-devel b/srcpkgs/cloog-devel
new file mode 120000
index 0000000000..d9e57c4521
--- /dev/null
+++ b/srcpkgs/cloog-devel
@@ -0,0 +1 @@
+cloog
\ No newline at end of file
diff --git a/srcpkgs/cloog/cloog-devel.template b/srcpkgs/cloog/cloog-devel.template
new file mode 100644
index 0000000000..4cd7989ad1
--- /dev/null
+++ b/srcpkgs/cloog/cloog-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'cloog-devel'.
+#
+depends="gmp-devel cloog>=$version"
+short_desc="${short_desc} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/cloog/cloog.rshlibs b/srcpkgs/cloog/cloog.rshlibs
new file mode 100644
index 0000000000..4804c5029e
--- /dev/null
+++ b/srcpkgs/cloog/cloog.rshlibs
@@ -0,0 +1,3 @@
+libisl.so.10
+libgmp.so.10
+libc.so.6
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
new file mode 100644
index 0000000000..e07ad361ae
--- /dev/null
+++ b/srcpkgs/cloog/template
@@ -0,0 +1,24 @@
+# Template file for 'cloog'
+pkgname=cloog
+version=0.17.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-isl=system --with-gmp=system"
+makedepends="isl-devel"
+subpackages="cloog-devel"
+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
+long_desc="
+ CLooG is a free software and library to generate code for scanning Z-polyhedra.
+ That is, it finds a code (e.g. in C, FORTRAN...) that reaches each integral
+ point of one or more parameterized polyhedra. CLooG has been originally written
+ to solve the code generation problem for optimizing compilers based on the
+ polytope model. Nevertheless it is used now in various area e.g. to build control
+ automata for high-level synthesis or to find the best polynomial approximation of
+ a function. CLooG may help in any situation where scanning polyhedra matters.
+ While the user has full control on generated code quality, CLooG is designed to
+ avoid control overhead and to produce a very effective code."