diff --git a/ChangeLog b/ChangeLog
index 984c3fc5a..5116604f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Do CPU substitution even if it's specified explicitly.
+	Reported and tested by: Alain Greppin.
+
 2011-01-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/Makefile.am (rs_decoder.S): Force compilation with -Os.
diff --git a/configure.ac b/configure.ac
index c013c9022..8bb585a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,15 +103,12 @@ else
   platform="$with_platform"
 fi
 
-# Adjust CPU unless target was explicitly specified.
-if test -z "$target_alias"; then
-  case "$target_cpu"-"$platform" in
-    x86_64-efi) ;;
-    x86_64-emu) ;;
-    x86_64-*) target_cpu=i386 ;;
-    powerpc64-ieee1275) target_cpu=powerpc ;;
-  esac
-fi
+case "$target_cpu"-"$platform" in
+  x86_64-efi) ;;
+  x86_64-emu) ;;
+  x86_64-*) target_cpu=i386 ;;
+  powerpc64-ieee1275) target_cpu=powerpc ;;
+esac
 
 # Check if the platform is supported, make final adjustments.
 case "$target_cpu"-"$platform" in