diff --git a/arch/Linux-x86-64-gfortran-regtest.pdbg b/arch/Linux-x86-64-gfortran-regtest.pdbg
index 1713c27b0c..fa2ca628d1 100644
--- a/arch/Linux-x86-64-gfortran-regtest.pdbg
+++ b/arch/Linux-x86-64-gfortran-regtest.pdbg
@@ -32,11 +32,12 @@ DFLAGS    += -D__MPI_VERSION=3 -D__PLUMED2 -D__SPGLIB
 DFLAGS    += -D__parallel -D__SCALAPACK
 DFLAGS    += -D__CHECK_DIAG
 
-WFLAGS     = -Waliasing -Wampersand -Wc-binding-type -Wconversion
-WFLAGS    += -Wintrinsic-shadow -Wintrinsics-std -Wline-truncation
-WFLAGS    += -Wno-tabs -Wrealloc-lhs -Wtarget-lifetime -Wunderflow
-WFLAGS    += -Wunused-but-set-variable -Wunused-dummy-argument -Wunused-variable
-WFLAGS    += -Werror
+WFLAGS     = -Wrealloc-lhs
+WFLAGS    += -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
+WFLAGS    += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
+WFLAGS    += -Werror=line-truncation -Werror=tabs -Werror=target-lifetime
+WFLAGS    += -Werror=underflow -Werror=unused-but-set-variable
+WFLAGS    += -Werror=unused-dummy-argument -Werror=unused-variable
 
 FCFLAGS    = $(CFLAGS) $(DFLAGS) $(WFLAGS)
 FCFLAGS   += -fcheck=bounds,do,recursion,pointer -ffree-form
diff --git a/arch/Linux-x86-64-gfortran-regtest.psmp b/arch/Linux-x86-64-gfortran-regtest.psmp
index 82daf0b170..edf45d9bb5 100644
--- a/arch/Linux-x86-64-gfortran-regtest.psmp
+++ b/arch/Linux-x86-64-gfortran-regtest.psmp
@@ -32,11 +32,12 @@ DFLAGS    += -D__MPI_VERSION=3 -D__PLUMED2 -D__SPGLIB
 DFLAGS    += -D__parallel -D__SCALAPACK
 DFLAGS    += -D__CHECK_DIAG
 
-WFLAGS     = -Waliasing -Wampersand -Wc-binding-type -Wconversion
-WFLAGS    += -Wintrinsic-shadow -Wintrinsics-std -Wline-truncation
-WFLAGS    += -Wno-tabs -Wrealloc-lhs -Wtarget-lifetime -Wunderflow
-WFLAGS    += -Wunused-but-set-variable -Wunused-dummy-argument -Wunused-variable
-WFLAGS    += -Werror
+WFLAGS     = -Wrealloc-lhs
+WFLAGS    += -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
+WFLAGS    += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
+WFLAGS    += -Werror=line-truncation -Werror=tabs -Werror=target-lifetime
+WFLAGS    += -Werror=underflow -Werror=unused-but-set-variable
+WFLAGS    += -Werror=unused-dummy-argument -Werror=unused-variable
 
 FCFLAGS    = $(CFLAGS) $(DFLAGS) $(WFLAGS)
 FCFLAGS   += -fcheck=bounds,do,recursion,pointer -ffree-form
diff --git a/arch/Linux-x86-64-gfortran-regtest.sdbg b/arch/Linux-x86-64-gfortran-regtest.sdbg
index 6ebe580a07..ad967ef099 100644
--- a/arch/Linux-x86-64-gfortran-regtest.sdbg
+++ b/arch/Linux-x86-64-gfortran-regtest.sdbg
@@ -22,11 +22,12 @@ CFLAGS     = -O1 -g -mtune=generic
 
 DFLAGS     = -D__FFTW3 -D__LIBINT -D__LIBXC -D__SPGLIB -D__CHECK_DIAG
 
-WFLAGS     = -Waliasing -Wampersand -Wc-binding-type -Wconversion
-WFLAGS    += -Wintrinsic-shadow -Wintrinsics-std -Wline-truncation
-WFLAGS    += -Wno-tabs -Wrealloc-lhs -Wtarget-lifetime -Wunderflow
-WFLAGS    += -Wunused-but-set-variable -Wunused-dummy-argument -Wunused-variable
-WFLAGS    += -Werror
+WFLAGS     = -Wrealloc-lhs
+WFLAGS    += -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
+WFLAGS    += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
+WFLAGS    += -Werror=line-truncation -Werror=tabs -Werror=target-lifetime
+WFLAGS    += -Werror=underflow -Werror=unused-but-set-variable
+WFLAGS    += -Werror=unused-dummy-argument -Werror=unused-variable
 
 FCFLAGS    = $(CFLAGS) $(DFLAGS) $(WFLAGS)
 FCFLAGS   += -fcheck=bounds,do,recursion,pointer -ffree-form
diff --git a/arch/Linux-x86-64-gfortran-regtest.ssmp b/arch/Linux-x86-64-gfortran-regtest.ssmp
index b1fca20fc8..2623b6e057 100644
--- a/arch/Linux-x86-64-gfortran-regtest.ssmp
+++ b/arch/Linux-x86-64-gfortran-regtest.ssmp
@@ -22,11 +22,12 @@ CFLAGS     = -O1 -g -mtune=generic
 
 DFLAGS     = -D__FFTW3 -D__LIBINT -D__LIBXC -D__SPGLIB -D__CHECK_DIAG
 
-WFLAGS     = -Waliasing -Wampersand -Wc-binding-type -Wconversion
-WFLAGS    += -Wintrinsic-shadow -Wintrinsics-std -Wline-truncation
-WFLAGS    += -Wno-tabs -Wrealloc-lhs -Wtarget-lifetime -Wunderflow
-WFLAGS    += -Wunused-but-set-variable -Wunused-dummy-argument -Wunused-variable
-WFLAGS    += -Werror
+WFLAGS     = -Wrealloc-lhs
+WFLAGS    += -Werror=aliasing -Werror=ampersand -Werror=c-binding-type
+WFLAGS    += -Werror=conversion -Werror=intrinsic-shadow -Werror=intrinsics-std
+WFLAGS    += -Werror=line-truncation -Werror=tabs -Werror=target-lifetime
+WFLAGS    += -Werror=underflow -Werror=unused-but-set-variable
+WFLAGS    += -Werror=unused-dummy-argument -Werror=unused-variable
 
 FCFLAGS    = $(CFLAGS) $(DFLAGS) $(WFLAGS)
 FCFLAGS   += -fcheck=bounds,do,recursion,pointer -ffree-form