diff --git a/fvwm-2.5.26-utf_encoding.patch b/fvwm-2.5.26-utf_encoding.patch
deleted file mode 100644
index 2b033e3..0000000
--- a/fvwm-2.5.26-utf_encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libs/FlocaleCharset.c
-+++ libs/FlocaleCharset.c
-@@ -521,7 +521,7 @@
- 	}
- 	if (FLCXOMCharsetList_num > 0 && FLCXOMCharsetList[0])
- 	{
--		FLCXOMCharset = FLCXOMCharsetList[0];
-+		FLCXOMCharset = FLCXOMCharsetList[FLCXOMCharsetList_num - 1];
- 	}
- #endif
- }
- 
diff --git a/fvwm2.changes b/fvwm2.changes
index 607e6fe..a78720a 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec  2 07:36:42 UTC 2011 - coolo@suse.com
+
+- remove uncommented patch
+
+-------------------------------------------------------------------
+Thu Dec  1 17:06:01 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
 -------------------------------------------------------------------
 Thu Sep  1 15:21:45 UTC 2011 - pgajdos@suse.com
 
diff --git a/fvwm2.spec b/fvwm2.spec
index de12574..227bac1 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -15,18 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           fvwm2
-BuildRequires:  freetype2-devel fribidi-devel gcc-c++ libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files xorg-x11-devel
-License:        GPLv2+
+BuildRequires:  automake
+BuildRequires:  freetype2-devel
+BuildRequires:  fribidi-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libpng-devel
+BuildRequires:  libstroke-devel
+BuildRequires:  pkgconfig
+BuildRequires:  readline-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
+License:        GPL-2.0+
 Group:          System/GUI/Other
 Provides:       fvwm fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
-AutoReqProv:    on
 Version:        2.5.26
-Release:        56
+Release:        0
 Summary:        Improved Version of FVWM Window Manager
 Url:            http://www.fvwm.org
 Source0:        fvwm-%{version}.tar.bz2
@@ -41,7 +46,6 @@ Patch0:         fvwm-configure.patch
 Patch1:         fvwm-%{version}-gcc-warnings.patch
 Patch2:         fvwm-%{version}-ia64.patch
 Patch3:         fvwm-%{version}-sv_SE.patch
-#Patch4:         fvwm-%{version}-utf_encoding.patch
 Patch5:         fvwm-%{version}-charset_in_title.patch
 Patch6:         fvwm-2.5.26-libpng.patch
 Patch7:         fvwm-%{version}-no-copy-dt-needed-entries.patch