diff --git a/configure.ac b/configure.ac
index 8fe432ad8a97..344dbd95be4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,6 @@ AC_DEFINE_UNQUOTED([SOF_MICRO], sof_micro, [Sof micro version])
 
 AC_CANONICAL_HOST
 
-# General compiler flags
-CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes"
-
 # General assembler flags
 ASFLAGS="-DASSEMBLY"
 AC_SUBST(ASFLAGS)
@@ -68,6 +65,7 @@ AM_CONDITIONAL(BUILD_LIB, test "$have_library" = "yes")
 AC_ARG_ENABLE(rimage, [AS_HELP_STRING([--enable-rimage],[build rimage tool])], have_rimage=$enableval, have_rimage=no)
 if test "$have_rimage" = "yes"; then
 	AC_DEFINE([CONFIG_RIMAGE], [1], [Configure to build rimage])
+	AM_CFLAGS="-O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes"
 fi
 AM_CONDITIONAL(BUILD_RIMAGE, test "$have_rimage" = "yes")
 
@@ -94,6 +92,11 @@ case "$with_arch" in
 	AM_LDFLAGS="-nostdlib"
 	AM_CCASFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
 
+	# GCC needs these additional flags on top of any user flags.
+	CFLAGS="${CFLAGS:+$CFLAGS } -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes"
+	LDFLAGS="${LDFLAGS:+$LDFLAGS } ${AM_LDFLAGS}"
+	CCASFLAGS="${CCASFLAGS:+$CCASFLAGS } ${AM_CCASFLAGS}"
+
 	ARCH="xtensa"
 	AC_SUBST(ARCH)
 
@@ -107,9 +110,9 @@ case "$with_arch" in
 	ARCH_CFLAGS="-g"
 
 	# automake FLAGS defined here
-	AM_CFLAGS="-O3"
+	AM_CFLAGS="-O3 -Wall -Werror -Wl,-EL -Wmissing-prototypes"
 	AM_LDFLAGS="-lpthread"
-	AM_CCASFLAGS="-O3"
+	AM_CCASFLAGS="-O3 -Wall -Werror -Wl,-EL -Wmissing-prototypes"
 
 	ARCH="host"
 	AC_SUBST(ARCH)
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 7e887a7c29e6..4c29967f1dd9 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -64,7 +64,7 @@ if BUILD_HOST
 # common linker flags for host libs
 host_lib_ldflags = \
 	$(AM_LDFLAGS) \
-	-version-info `echo $(VERSION) | cut -d '.' -f 1` \
+	-version-info `echo $(VERSION) | cut -d '.' -f 1 | cut -d '0' -f 2` \
 	-no-undefined \
 	-export-dynamic
 
diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index 917384224013..69d7ea10d513 100644
--- a/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@ -6,7 +6,7 @@ libsof_ipc_la_SOURCES = \
 
 libsof_ipc_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
-	-version-info `echo $(VERSION) | cut -d '.' -f 1` \
+	-version-info `echo $(VERSION) | cut -d '.' -f 1 | cut -d '0' -f 2` \
 	-no-undefined \
 	-export-dynamic