diff --git a/mod_php_install.sh b/mod_php_install.sh
index 6ffee88..fc657e0 100755
--- a/mod_php_install.sh
+++ b/mod_php_install.sh
@@ -6389,8 +6389,6 @@ if ! $WITHOUT_APACHE_MOD_PHP ; then
 fi
 cd $_builddir || exit 1
 
-echononl "\tGoing to configure.."
-
 # : ${_arch:=i686}
 # : ${_arch:=athlon}
 # : ${_arch:=k8} ##  --> x86-64 instructionset
@@ -6419,6 +6417,28 @@ if main_version_eq "7.4" ; then
    export CXXFLAGS="-O2 -pipe -std=gnu++17"
    export CFLAGS="-O2 -pipe"
 fi
+if main_version_eq "8.0" ; then
+#   cp -a build/php_cxx_compile_stdcxx.m4 build/php_cxx_compile_stdcxx.m4.ORIG
+#
+#sed -i 's/-std=c++11/-std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#sed -i 's/-std=gnu++11/-std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#sed -i 's/-std=c++14/-std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#sed -i 's/-std=gnu++14/-std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#sed -i 's/-std=c++0x/-std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#
+#   #sed -i 's/std=c++11/std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#   #sed -i 's/std=gnu++11/std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#   #sed -i 's/std=c++0x/std=gnu++17/g' build/php_cxx_compile_stdcxx.m4
+#   echo ""
+#   ./buildconf --force
+#   echo ""
+#   echo ""
+#
+   export CC=gcc
+   export CXX=g++
+   export CXXFLAGS="-O2 -pipe -std=gnu++17"
+   export ICU_CXXFLAGS="-std=gnu++17"
+fi
 
 config_params="
    --prefix=$PREFIX_PHP
@@ -6667,6 +6687,9 @@ if $WITH_PHP_FPM_SUPPORT ; then
    config_params="$config_params --enable-fpm"
 fi
 
+
+echononl "\tGoing to configure.."
+
 echo "LDFLAGS=\"-s\" ./configure $config_params" > ${_logdir}/php-configure.log
 echo "" >> ${_logdir}/php-configure.log
 
@@ -9418,8 +9441,9 @@ echo "" >> ${_logdir}/pecl_install.log
 
 echononl "\tInstall 'imap' via pecl.."
 
-if main_version_ge "8.3" && \
-   ( main_version_ge "8.4" || ([[ "$os_family" == "debian" ]] && (( os_version >= 13 ))) ); then
+#if main_version_ge "8.3" && \
+#   ( main_version_ge "8.4" || ([[ "$os_family" == "debian" ]] && (( os_version >= 13 ))) ); then
+if main_version_ge "8.4" ; then
 
    if dpkg -s libc-client-dev > /dev/null 2>&1 \
         || dpkg -s libc-client2007e-dev > /dev/null 2>&1 \