diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index 5f50c07f..8fe87c3a 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -10,10 +10,12 @@ config CLOOG_V_0_15_11
     bool
     prompt "0.15.11 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
+    select CLOOG_0_15_1x
 
 config CLOOG_V_0_15_10
     bool
     prompt "0.15.10"
+    select CLOOG_0_15_1x
 
 config CLOOG_V_0_15_9
     bool
@@ -46,3 +48,10 @@ config CLOOG_VERSION
     default "0.15.5" if CLOOG_V_0_15_5
     default "0.15.4" if CLOOG_V_0_15_4
     default "0.15.3" if CLOOG_V_0_15_3
+
+config CLOOG_0_15_1x
+    bool
+    select CLOOG_NEEDS_AUTORECONF
+
+config CLOOG_NEEDS_AUTORECONF
+    bool
diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index 094a02f5..4cf6075d 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -26,7 +26,7 @@ do_cloog_extract() {
     CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}"
     CT_Patch "cloog-ppl" "${CT_CLOOG_VERSION}"
 
-    if [ "${CT_CLOOG_VERSION}" = "0.15.10" ]; then
+    if [ "${CT_CLOOG_NEEDS_AUTORECONF}" = "y" ]; then
         CT_Pushd "${CT_SRC_DIR}/cloog-ppl-${CT_CLOOG_VERSION}"
         CT_DoExecLog CFG ./autogen.sh
         CT_Popd