diff --git a/grub2.changes b/grub2.changes
index b080ef0..1b9f86a 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  2 16:31:14 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
 -------------------------------------------------------------------
 Mon Nov 28 09:40:44 CET 2011 - jslaby@suse.de
 
diff --git a/grub2.spec b/grub2.spec
index f41a681..80d4d95 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -15,17 +15,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           grub2
 %ifarch x86_64 ppc64
-BuildRequires:  freetype2-devel-32bit gcc-32bit glibc-32bit glibc-devel-32bit
-BuildRequires:  libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit
+BuildRequires:  freetype2-devel-32bit
+BuildRequires:  gcc-32bit
+BuildRequires:  glibc-32bit
+BuildRequires:  glibc-devel-32bit
+BuildRequires:  libncurses5-32bit
+BuildRequires:  libusb-1_0-devel-32bit
+BuildRequires:  ncurses-devel-32bit
 %else
-BuildRequires:  freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel
+BuildRequires:  freetype2-devel
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libncurses5
+BuildRequires:  libusb-1_0-devel
 BuildRequires:  ncurses-devel
 %endif
-BuildRequires:  bison device-mapper-devel fdupes flex lzma ruby xz
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  device-mapper-devel
+BuildRequires:  fdupes
+BuildRequires:  flex
+BuildRequires:  lzma
+BuildRequires:  ruby
+BuildRequires:  xz
 
 # Modules always contain just 32-bit code
 %define _libdir %{_exec_prefix}/lib
@@ -46,10 +60,10 @@ BuildRequires:  bison device-mapper-devel fdupes flex lzma ruby xz
 %endif
 
 Version:        1.99
-Release:        6
+Release:        0
 Summary:        Bootloader with support for Linux, Multiboot and more
 Group:          System/Boot
-License:        GPLv3+
+License:        GPL-3.0+
 Url:            http://www.gnu.org/software/grub/
 Source0:        ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
 Source1:        90_persistent
@@ -89,7 +103,6 @@ file that is part of this package's documentation for more information.
 %package efi
 
 Summary:        GRUB2 for EFI systems
-Group:          System/Boot
 %ifarch ia64 x86_64
 #Package is available on ia64 and x86_64 only and not necessarily needed
 Requires:       efibootmgr