diff --git a/acconfig.h b/acconfig.h
index 178b50e40f..bee8dafad0 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,6 +17,8 @@
 
 #undef HAVE_CPU_I386
 #undef HAVE_CPU_PPC
+#undef HAVE_CPU_ALPHA
+#undef HAVE_CPU_ARM
 
 #undef HAVE_GDK_PIXBUF
 #undef HAVE_LIBGHTTP
diff --git a/configure.in b/configure.in
index 68a1a4d3f1..f00b9ab06c 100644
--- a/configure.in
+++ b/configure.in
@@ -117,6 +117,10 @@ case "x${target_cpu}" in
              AC_DEFINE(HAVE_CPU_I386) ;;
   xpowerpc)  HAVE_CPU_PPC=yes ;
              AC_DEFINE(HAVE_CPU_PPC) ;;
+  xalpha)    HAVE_CPU_ALPHA=yes ;
+             AC_DEFINE(HAVE_CPU_ALPHA) ;;
+  xarm)      HAVE_CPU_ARM=yes ;
+             AC_DEFINE(HAVE_CPU_ARM) ;;
 esac
 
 dnl Determine endianness
diff --git a/gst/gstarm.h b/gst/gstarm.h
index 3b626e969a..435b23063f 100644
--- a/gst/gstarm.h
+++ b/gst/gstarm.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2000 Wim Taymans <wtay@chello.be>
  *
- * gstppc.h: Header for PPC-specific architecture issues
+ * gstarm.h: Header for ARM-specific architecture issues
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -24,10 +24,10 @@
 #define __GST_GSTARM_H__
 
 #define GST_ARCH_SET_SP(stackpointer) \
-    __asm__( "mov%?\t%!sp, %0" : : "r"(stackpointer));
+    __asm__( "mov sp, %0" : : "r"(stackpointer));
 
 #define GST_ARCH_CALL(target) \
-    __asm__( "mov%?\t%!pc, %1" : : "r"(target) );
+    __asm__( "mov pc, %0" : : "r"(target) );
 
 // Need to get more information about the stackframe format
 // and get the fields more correct.  Check GDB sources maybe?