diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 9058f1293c..c39fb0c03a 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -242,7 +242,7 @@ ifneq ($(shell uname -m),armv4l)
 ifneq ($(shell uname -m),sparc64)
 ifneq (${PROC},arm)
 ifneq ($(shell uname -m), parisc)
-ifneq (${PROC}, s390)
+ifneq ($(shell uname -m),s390)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -309,6 +309,7 @@ ifneq ($(shell uname -m), alpha)
 ifneq ($(shell uname -m), sparc64)
 ifneq ($(shell uname -m), armv4l)
 ifneq ($(shell uname -m), parisc)
+ifneq ($(shell uname -m),s390)
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif
@@ -319,6 +320,7 @@ endif
 endif
 endif
 endif
+endif
 
 TOAST_OBJECTS =	$(SRC)/toast.o 		\
 		$(SRC)/toast_lin.o	\