diff --git a/configure b/configure
index da92adede698d84e74aefc96f4e33e248b7a2caf..c997750d6e072795e8acf428e60b0d1e7308c494 100755
--- a/configure
+++ b/configure
@@ -13627,7 +13627,7 @@ fi
 # CFLAGS #
 ##########
 
-BASEFLAGS="-Werror -Wall"
+BASEFLAGS="-Werror -Wall -Wextra"
 if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
     BASEFLAGS="${BASEFLAGS} -g"
 else
@@ -16002,12 +16002,15 @@ fi
 ################
 
 AFF_CFLAGS=$(echo $CFLAGS | sed -e "s+$PWD+\$BUILD_PATH+g")
+AFF_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+AFF_VERSION=$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
 LKT_CONFIG_RESULT="
 ########## Lektor configuration ###########
 #
 # Configure run on..... $(date)
 # Compiler C........... $(basename $CC)
-# Version.............. mk7.$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
+# Version.............. mk7.$AFF_VERSION
+# Branch............... $AFF_BRANCH
 #
 ### Build options
 #
diff --git a/configure.ac b/configure.ac
index 3ac6d1ea3537369856a73cb1d747f6884c586913..711dc54e0be7d51970071d3881cf2ec07c84218f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ fi
 # CFLAGS #
 ##########
 
-BASEFLAGS="-Werror -Wall"
+BASEFLAGS="-Werror -Wall -Wextra"
 if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
     BASEFLAGS="${BASEFLAGS} -g"
 else
@@ -166,12 +166,15 @@ AC_OUTPUT([
 ################
 
 AFF_CFLAGS=$(echo $CFLAGS | sed -e "s+$PWD+\$BUILD_PATH+g")
+AFF_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+AFF_VERSION=$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
 LKT_CONFIG_RESULT="
 ########## Lektor configuration ###########
 #
 # Configure run on..... $(date)
 # Compiler C........... $(basename $CC)
-# Version.............. mk7.$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
+# Version.............. mk7.$AFF_VERSION
+# Branch............... $AFF_BRANCH
 #
 ### Build options
 #