diff --git a/hdparm-9.16-nostrip.patch b/hdparm-9.16-nostrip.patch
deleted file mode 100644
index bad2580..0000000
--- a/hdparm-9.16-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up hdparm-9.16/Makefile.nostrip hdparm-9.16/Makefile
---- hdparm-9.16/Makefile.nostrip	2009-07-17 22:52:36.000000000 +0200
-+++ hdparm-9.16/Makefile	2009-07-17 22:52:42.000000000 +0200
-@@ -28,7 +28,6 @@ all: hdparm
- 
- hdparm: hdparm.h sgio.h $(OBJS)
- 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
--	$(STRIP) hdparm
- 
- hdparm.o:	hdparm.h sgio.h
- 
diff --git a/hdparm.spec b/hdparm.spec
index 489ac8e..aa7507f 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,12 +1,11 @@
 Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
 Version: 9.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
 Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz
-Patch0: hdparm-9.16-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
@@ -17,16 +16,13 @@ performance and to spin down hard drives for power conservation.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-perl -pi -e "s/-O2/$RPM_OPT_FLAGS/g" Makefile
-make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} STRIP=/bin/true LDFLAGS=
 
 %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
 install -c -m 755 hdparm $RPM_BUILD_ROOT/sbin/hdparm
 install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
@@ -41,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Thu Aug 20 2009 Ville Skyttä <ville.skytta@iki.fi> - 9.16-3
+- Let rpmbuild strip the executable (#513025).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild