diff --git a/hdparm.spec b/hdparm.spec
index 0ab4cbf..8c890fa 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,4 +1,4 @@
-Summary: A utility for displaying and/or setting hard disk parameters.
+Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
 Version: 6.9
 Release: 1
@@ -6,9 +6,8 @@ License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
 Source: http://hdparm.sourceforge.net/sourceforge/hdparm/hdparm-%{version}.tar.gz
-Patch0:	hdparm-5.8-help.patch
-Patch1:	hdparm-5.9-nostrip.patch
-Patch2:	hdparm-6.3-idestruct.patch
+Patch0: hdparm-5.8-help.patch
+Patch1: hdparm-5.9-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 ExcludeArch: s390 s390x
 
@@ -21,13 +20,13 @@ performance and to spin down hard drives for power conservation.
 %setup -q
 %patch0 -p1 
 %patch1 -p1 
-#patch2 -p1 
 
 %build
 perl -pi -e "s/-O2/$RPM_OPT_FLAGS/g" Makefile
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/doc
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
@@ -39,11 +38,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc hdparm.lsm Changelog
+%doc hdparm.lsm Changelog LICENSE.TXT
 /sbin/hdparm
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Mon Feb 05 2007 Karsten Hopp <karsten@redhat.com> 6.9-2
+- clean up spec file for merge review (#225882)
+
 * Thu Jan 18 2007 Karsten Hopp <karsten@redhat.com> 6.9-1
 - update to 6.9
 
@@ -173,39 +175,39 @@ rm -rf $RPM_BUILD_ROOT
 - update to version 4.1
 - update URL
 
-* Wed Jul 19 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Wed Jul 19 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - disable readahead (#14268)
 - add comment in /etc/sysconfig/harddisks about possible extra parameters
 
 * Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
-* Wed Jul 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Wed Jul 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - disable 32 bit interfacing (#13730)
 
-* Tue Jun 27 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Tue Jun 27 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - use %%{_tmppath}
 - add /etc/sysconfig/harddisks, a new file for hardisk 
   optimization parameters
 
-* Mon Jun 18 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Mon Jun 18 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - FHSify
 
-* Sun Apr  9 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Sun Apr  9 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Fix compilation with kernel 2.3.*
 
-* Thu Feb 17 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Thu Feb 17 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - 3.9
 - handle RPM_OPT_FLAGS
 
-* Thu Feb 17 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Thu Feb 17 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Use O_NONBLOCK when opening devices so we can manipulate CD-ROM drives
   with no media inserted, even when running a current kernel (Bug #6457)
 
 * Sat Feb  5 2000 Bill Nottingham <notting@redhat.com>
 - build as non-root user (#6458)
 
-* Fri Feb  4 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Fri Feb  4 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - deal with RPM compressing man pages
 
 * Fri Nov 19 1999 Bernhard Rosenkraenzer <bero@redhat.com>