diff --git a/ChangeLog b/ChangeLog
index eec251552..23dac4858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-install.in: Fix an automatic target detection bug.
+
 2012-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: New option --efi-directory.
diff --git a/util/grub-install.in b/util/grub-install.in
index 4d47c3c75..748d39e0a 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -294,8 +294,10 @@ if [ x$source_dir = x ]; then
 		esac
 		if [ -d /sys/firmware/efi ]; then
 		    target="x86_64-efi"
+		else
+		    target=i386-pc
 		fi
-		target=i386-pc;;
+		;;
 	    x"i"?"86"*)
                 # On Linux, we need the efivars kernel modules.
 		# If no EFI is available this module just does nothing
@@ -308,11 +310,12 @@ if [ x$source_dir = x ]; then
 		esac
 		if [ -d /sys/firmware/efi ]; then
 		    target="i386-efi"
-		fi
-		if [ -e /proc/device-tree ]; then
+		elif [ -e /proc/device-tree ]; then
 		    target="i386-ieee1275"
+		else
+		    target=i386-pc
 		fi
-		target=i386-pc;;
+		;;
 	    *)
 		gettext "Unable to determine your platform. Use --target." ;
 		echo	;;