diff --git a/perl-Authen-Htpasswd.spec b/perl-Authen-Htpasswd.spec
index d972445..77f4d67 100644
--- a/perl-Authen-Htpasswd.spec
+++ b/perl-Authen-Htpasswd.spec
@@ -2,7 +2,7 @@
 %define name	perl-%{realname}
 %define	modprefix Authen
 %define version	0.16
-%define release	%mkrel 3
+%define release	%mkrel 4
 
 Summary:	Interface to read and modify Apache .htpasswd files
 Name:		%{name}
@@ -12,14 +12,17 @@ License:	Artistic/GPL
 Group:		Development/Perl
 URL:		http://search.cpan.org/dist/%{realname}/
 Source:		ftp://ftp.perl.org/pub/CPAN/modules/by-module/%{modprefix}/%{realname}-%{version}.tar.bz2
+Patch0:		Authen-Htpasswd-0.16-bug27012.diff
+Patch1:		Authen-Htpasswd-0.16-bug37785.diff
 %if %{mdkversion} < 1010
 BuildRequires:	perl-devel
 %endif
 BuildRequires:	perl(Class::Accessor::Fast)
 BuildRequires:	perl(Digest)
 BuildRequires:	perl(IO::LockedFile)
+BuildRequires:	perl(Crypt::PasswdMD5)
 BuildArch:	noarch
-Buildroot:	%{_tmppath}/%{name}-%{version}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 This module provides a convenient, object-oriented interface to Apache-style
@@ -29,6 +32,8 @@ Digest::SHA1 for SHA1.
 
 %prep
 %setup -q -n %{realname}-%{version}
+%patch0 -p0
+%patch1 -p0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor