diff --git a/configure b/configure
index b403d81f..31128050 100755
--- a/configure
+++ b/configure
@@ -238,17 +238,24 @@ elif [ -n "$1" ] && [ $1 = "AMIGA" ] ; then
 	if [ -n "$2" ] && [ $2 = "TEST" ] ; then
 		test=" -DWITHTEST"
 	fi
-	  
+	
+	arc=""
+	agcc="gcc"
+	if [ -n "$3" ] ; then
+		arc=" $3 -noixemul"
+		agcc="m68k-amigaos-gcc"
+	fi
+	
 	(
 	echo "# Amiga Makefile generated by configure"
 	echo 
 	echo "all:	amath"
 	echo 
-	echo "CC = gcc"
-	echo "CFLAGS += -O2 -DAOS$test -resident -s -I. -Wall -Werror"	
-	echo "LFLAGS += -lgcc"
+	echo "CC = $agcc"
+	echo "CFLAGS = -O2 -DAOS$test$arc -resident -s -I. -Wall -Werror"
+	echo "LFLAGS = -lgcc"
 	echo 
-
+	
 	l=""
 	for f in ${SRCS}
 	do
@@ -328,8 +335,8 @@ else
 	echo "all:	amath"
 	echo 
 	echo "CC = cc"
-	echo "CFLAGS += -O0 -g -DINTELCPU -DANSICONSOLE$test -I. -Wall -Werror"
-	echo "LFLAGS += -lstdc++"
+	echo "CFLAGS = -O0 -g -DINTELCPU -DANSICONSOLE$test -I. -Wall -Werror"
+	echo "LFLAGS = -lstdc++"
 	echo 
 	
 	l=""