diff --git a/.cvsignore b/.cvsignore
index 6c3b33c..d90fb9b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hdparm-9.12.tar.gz
+hdparm-9.27.tar.gz
diff --git a/hdparm-9.27-timeout-536731.patch b/hdparm-9.27-timeout-536731.patch
new file mode 100644
index 0000000..a38dced
--- /dev/null
+++ b/hdparm-9.27-timeout-536731.patch
@@ -0,0 +1,21 @@
+diff -up hdparm-9.27/hdparm.c.sec_timeout hdparm-9.27/hdparm.c
+--- hdparm-9.27/hdparm.c.sec_timeout	2009-12-11 12:48:43.000000000 +0100
++++ hdparm-9.27/hdparm.c	2009-12-11 12:47:48.000000000 +0100
+@@ -137,7 +137,7 @@ static int	please_destroy_my_drive = 0;
+ 
+ const int timeout_12secs = 12;
+ const int timeout_5mins = (5 * 60);
+-const int timeout_2hrs   = (2 * 60 * 60);
++const int timeout_12hrs   = (12 * 60 * 60);
+ 
+ static int open_flags = O_RDONLY|O_NONBLOCK;
+ 
+@@ -767,7 +767,7 @@ do_set_security (int fd)
+ 			err = errno;
+ 			perror("ERASE_PREPARE");
+ 		} else {
+-			if ((do_taskfile_cmd(fd, r, timeout_2hrs))) {
++			if ((do_taskfile_cmd(fd, r, timeout_12hrs))) {
+ 				err = errno;
+ 				perror("SECURITY_ERASE");
+ 			}
diff --git a/hdparm.spec b/hdparm.spec
index aa7507f..585fa67 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,11 +1,12 @@
 Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
-Version: 9.16
-Release: 3%{?dist}
+Version: 9.27
+Release: 1%{?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.27-timeout-536731.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
@@ -16,6 +17,7 @@ performance and to spin down hard drives for power conservation.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} STRIP=/bin/true LDFLAGS=
@@ -37,6 +39,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Fri Dec 11 2009 Karsten Hopp <karsten@redhat.com> 9.27-1
+- update to 9.27
+- enhance security-erase timeout to 12h (#536731)
+
 * Thu Aug 20 2009 Ville Skyttä <ville.skytta@iki.fi> - 9.16-3
 - Let rpmbuild strip the executable (#513025).
 
diff --git a/sources b/sources
index 10b67df..9a612d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d11e2158c4ca8863de830f686574a4a3  hdparm-9.16.tar.gz
+e652dabb6c9233fb8a23ef60a17a1829  hdparm-9.27.tar.gz