diff --git a/bin/_runphp_build-all b/bin/_runphp_build-all
index bcc7609..c6d0f4f 100755
--- a/bin/_runphp_build-all
+++ b/bin/_runphp_build-all
@@ -20,8 +20,10 @@ runphp=("$MYDIR/../runphp/runphp" --bs)
 [ -z "$force" ] && runphp+=(--ue)
 
 for RUNPHP_DIST in d12 d11; do
-    for RUNPHP_BUILD_FLAVOUR in +ic ""; do
-        etitle "$RUNPHP_DIST$RUNPHP_BUILD_FLAVOUR"
+    for RUNPHP_BUILD_FLAVOUR in +ic none; do
+        flavour="$RUNPHP_BUILD_FLAVOUR"
+        [ "$flavour" == none ] && flavour=
+        etitle "$RUNPHP_DIST$flavour"
         "${runphp[@]}"
         eend
     done
diff --git a/runphp/runphp b/runphp/runphp
index 4970664..87691d7 100755
--- a/runphp/runphp
+++ b/runphp/runphp
@@ -103,6 +103,7 @@ else
     [ "$BUILDENV0" == none ] && BUILDENV0=
     [ "$BUILDENV" == none ] && BUILDENV=
 fi
+[ "$BUILD_FLAVOUR" == none ] && BUILD_FLAVOUR=
 
 function after_source_buildenv() {
     NDIST="${DIST#d}"
diff --git a/runphp/runphp.2postamble b/runphp/runphp.2postamble
index ca06729..83f987b 100644
--- a/runphp/runphp.2postamble
+++ b/runphp/runphp.2postamble
@@ -54,6 +54,7 @@ else
     [ "$BUILDENV0" == none ] && BUILDENV0=
     [ "$BUILDENV" == none ] && BUILDENV=
 fi
+[ "$BUILD_FLAVOUR" == none ] && BUILD_FLAVOUR=
 
 function after_source_buildenv() {
     NDIST="${DIST#d}"