diff --git a/ChangeLog b/ChangeLog
index b3e8436b9..e87616cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Don't add -no-itegrated-as on clang on non-x86.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Allow compiling with clang (not really supported though).
diff --git a/configure.ac b/configure.ac
index 37d928979..d8bf76ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,8 @@ AC_CACHE_CHECK([if compiling with clang], [grub_cv_cc_target_clang]
 ]])],
 [grub_cv_cc_target_clang=no], [grub_cv_cc_target_clang=yes])])
 
-if test "x$grub_cv_cc_target_clang" = xyes; then
+# clang doesn't support .code16
+if test "x$grub_cv_cc_target_clang" = xyes && ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -no-integrated-as"
 fi