diff --git a/enable_test_tools.diff b/enable_test_tools.diff
deleted file mode 100644
index 6a456b1..0000000
--- a/enable_test_tools.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -u -r -p tests.orig//Makefile.am tests/Makefile.am
---- tests.orig//Makefile.am	2009-12-01 22:49:53.000000000 +0100
-+++ tests/Makefile.am	2009-12-01 22:50:07.000000000 +0100
-@@ -6,7 +6,8 @@ AM_CPPFLAGS = \
- 
- LDADD = $(top_builddir)/libdrm.la
- 
--check_PROGRAMS = \
-+check_PROGRAMS =
-+bin_PROGRAMS = \
- 	dristat \
- 	drmstat
- 
-diff -u -r -p tests.orig//modeprint/Makefile.am tests/modeprint/Makefile.am
---- tests.orig//modeprint/Makefile.am	2009-12-01 22:49:53.000000000 +0100
-+++ tests/modeprint/Makefile.am	2009-12-01 22:50:26.000000000 +0100
-@@ -3,7 +3,7 @@ AM_CFLAGS = \
- 	-I$(top_srcdir)/intel/ \
- 	-I$(top_srcdir)
- 
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- 	modeprint
- 
- modeprint_SOURCES = \
-diff -u -r -p tests.orig//modetest/Makefile.am tests/modetest/Makefile.am
---- tests.orig//modetest/Makefile.am	2009-12-01 22:49:53.000000000 +0100
-+++ tests/modetest/Makefile.am	2009-12-01 22:50:45.000000000 +0100
-@@ -4,7 +4,7 @@ AM_CFLAGS = \
- 	-I$(top_srcdir) \
- 	$(CAIRO_CFLAGS)
- 
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- 	modetest
- 
- modetest_SOURCES = \
diff --git a/libdrm.changes b/libdrm.changes
index 8ac579a..e1e67be 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 24 16:56:34 UTC 2011 - eich@suse.de
+
+- removed patch: enable_test_tools.diff.
+  - Building and installing dristat and drmstat can be done
+    from the spec file. Same is true for installing drmmodeprint
+    and drmmodetest.
+
 -------------------------------------------------------------------
 Wed Jan  5 02:10:17 UTC 2011 - sndirsch@novell.com
 
diff --git a/libdrm.spec b/libdrm.spec
index ab91b97..1f4d047 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdrm (Version 2.4.23)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ License:        MIT License (or similar)
 Group:          System/Libraries
 AutoReqProv:    on
 Version:        2.4.23
-Release:        2
+Release:        3
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
 # bug437293
@@ -37,7 +37,6 @@ Provides:       libdrm-64bit = %{version}
 Summary:        Userspace Interface for Kernel DRM Services
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch:          enable_test_tools.diff
 Patch1:         intel-Export-CONSTANT_BUFFER-addressing-mode.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -64,7 +63,6 @@ services.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch
 %patch1 -p1
 
 %build
@@ -72,13 +70,18 @@ autoreconf -fi
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev
 %{__make} %{?jobs:-j%jobs}
-%{__make} %{?jobs:-j%jobs} -C tests/modeprint
-%{__make} %{?jobs:-j%jobs} -C tests/modetest
+%{__make} %{?jobs:-j%jobs} -C tests check-am
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 make -C tests/modeprint install DESTDIR=$RPM_BUILD_ROOT
 make -C tests/modetest install DESTDIR=$RPM_BUILD_ROOT
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/bin
+%{__install}  \
+    tests/dristat \
+    tests/drmstat \
+    tests/modeprint/modeprint \
+    tests/modetest/modetest $RPM_BUILD_ROOT/usr/bin
 
 %clean
 rm -rf $RPM_BUILD_ROOT