diff --git a/bti.spec b/bti.spec
index 2faf3f5..98ff446 100644
--- a/bti.spec
+++ b/bti.spec
@@ -7,10 +7,11 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.kernel.org/pub/linux/kernel/people/gregkh/bti
 Source0:        http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2
+Patch0:         bti-023-readline5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # still supporting EL-5, rename to libcurl-devel once this changes
-BuildRequires:  curl-devel compat-readline5-devel libxml2-devel
+BuildRequires:  curl-devel compat-readline5-devel libxml2-devel pcre-devel
 #Requires:       
 
 %description
@@ -20,18 +21,17 @@ and fast manner to annoy the whole world.
 
 %prep
 %setup -q
+%patch0 -p1 -b .readline5
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/readline5" \
-  LDFLAGS="-L%{_libdir}/readline5" make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags} LDFLAGS="-L%{_libdir}/readline5"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p bti $RPM_BUILD_ROOT%{_bindir}/
-cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 # bash completion
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti
@@ -43,11 +43,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES
+%doc bti.example ChangeLog COPYING README RELEASE-NOTES
 # Own the directory so that we do not need to Require:
 # bash-completion just for one file
-%config %{_sysconfdir}/bash_completion.d
+%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/bash_completion.d/bti
 %{_bindir}/bti
+%{_bindir}/bti-shrink-urls
 %{_mandir}/man1/*