diff --git a/common.mak b/common.mak
index 5815fd48f6..be7d476eb3 100644
--- a/common.mak
+++ b/common.mak
@@ -15,11 +15,6 @@ CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-#FIXME: This should be in configure/config.mak
-ifeq ($(TARGET_ARCH_SPARC64),yes)
-CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
-endif
-
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
diff --git a/configure b/configure
index 3b3e8606c9..2dd5bf976c 100755
--- a/configure
+++ b/configure
@@ -1048,6 +1048,9 @@ if test $tune != "generic"; then
         i[3456]86|pentium|pentiumpro|pentium-mmx|pentium[234]|prescott|k6|k6-[23]|athlon|athlon-tbird|athlon-4|athlon-[mx]p|winchip-c6|winchip2|c3|nocona|athlon64|k8|opteron|athlon-fx)
             CFLAGS="$CFLAGS -march=$tune"
         ;;
+        sparc64)
+            CFLAGS="$CFLAGS -mcpu=ultrasparc -mtune=ultrasparc"
+        ;;
         *)
         echo "WARNING: Unknown CPU \"$tune\", ignored."
         ;;