diff --git a/tk-8.5.12-fix-xft.patch b/tk-8.5.12-fix-xft.patch
new file mode 100644
index 0000000..5344c4d
--- /dev/null
+++ b/tk-8.5.12-fix-xft.patch
@@ -0,0 +1,13 @@
+--- tk8.5.9/unix/configure.in.old	2010-09-02 20:12:14.000000000 +0200
++++ tk8.5.9/unix/configure.in	2011-02-17 13:32:22.719116636 +0100
+@@ -530,8 +530,8 @@
+ 	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ 	if test "$found_xft" = "no" ; then
+ 	    found_xft=yes
+-	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+-	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++	    XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no"
++	    XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no"
+ 	fi
+ 	AC_MSG_RESULT([$found_xft])
+ 	dnl make sure that compiling against Xft header file doesn't bomb
diff --git a/tk.changes b/tk.changes
index 2833e0d..f96ccb9 100644
--- a/tk.changes
+++ b/tk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct  5 08:52:15 UTC 2012 - aj@suse.de
+
+- Fix configure xft detection (add patch tk-8.5.12-fix-xft.patch).
+- Replace build requires of xorg-x11-devel with those that are really
+  needed.
+
 -------------------------------------------------------------------
 Thu Aug  9 12:41:35 UTC 2012 - max@suse.com
 
diff --git a/tk.spec b/tk.spec
index d73318b..4f0b7ac 100644
--- a/tk.spec
+++ b/tk.spec
@@ -17,8 +17,13 @@
 
 
 Name:           tk
+BuildRequires:  imake
+BuildRequires:  libX11-devel
+BuildRequires:  libXScrnSaver-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXt-devel
+BuildRequires:  pkg-config
 BuildRequires:  tcl-devel
-BuildRequires:  xorg-x11-devel
 Url:            http://www.tcl.tk
 Version:        8.5.12
 Release:        0
@@ -42,6 +47,7 @@ Source0:        %name%{version}%{rrc}-src.tar.gz
 Source1:        tk-rpmlintrc
 Source2:        baselibs.conf
 Patch0:         %name.patch
+Patch1:         tk-8.5.12-fix-xft.patch
 
 %description
 Tk is a graphical user interface toolkit that takes developing desktop
@@ -88,6 +94,7 @@ Authors:
 %prep
 %setup -q -n %name%version
 %patch0
+%patch1 -p1
 
 %build
 cd unix