diff --git a/.cvsignore b/.cvsignore
index f905070..c64c71c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-source-highlight-2.10.tar.gz
-source-highlight-2.10.tar.gz.sig
+source-highlight-3.1.3.tar.gz
+source-highlight-3.1.3.tar.gz.sig
diff --git a/source-highlight.spec b/source-highlight.spec
index 265ef41..add7005 100644
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,15 +1,15 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 2.10
-Release: 5%{?dist}
+Version: 3.1.3
+Release: 1%{?dist}
 Group: Development/Tools
 License: GPLv3+
-Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.10.tar.gz
-Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.10.tar.gz.sig
+Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
 URL: http://www.gnu.org/software/src-highlite/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison, flex, boost-devel
-BuildRequires: help2man, ctags
+BuildRequires: help2man, ctags, chrpath
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Requires: ctags
@@ -21,11 +21,22 @@ Java, Javascript, C/C++, Prolog, Perl, Php3, Python, Flex, ChangeLog, Ruby,
 Lua, Caml, Sml and Log as source languages, and HTML, XHTML and ANSI color 
 escape sequences as output format.
 
+
+%package devel
+Summary: Development files for source-highlight
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Development files for source-highlight
+
 %prep
 %setup -q
 
 %build
-%configure
+%configure --disable-static \
+           --with-boost-regex=boost_regex
 make %{?_smp_mflags}
 
 %install
@@ -36,11 +47,16 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
 %{__sed} -i 's/\r//' docs/source-highlight/*.css
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 /sbin/install-info %{_infodir}/source-highlight.info \
   %{_infodir}/dir 2>/dev/null || :
 
@@ -50,6 +66,8 @@ if [ $1 -eq 0 ]; then
     %{_infodir}/dir 2>/dev/null || :
 fi
 
+%postun -p /sbin/ldconfig
+
 %files
 %defattr (-,root,root)
 %doc docs/source-highlight/*
@@ -57,12 +75,33 @@ fi
 %{_bindir}/java2html
 %{_bindir}/source-highlight
 %{_bindir}/check-regexp
+%{_bindir}/source-highlight-settings
 %{_bindir}/src-hilite-lesspipe.sh
-%{_datadir}/%{name}
+%dir %{_sysconfdir}/bash_completion.d
+%{_sysconfdir}/bash_completion.d/source-highlight-bash-completion
+%{_libdir}/libsource-highlight.so.*
+%dir %{_datadir}/source-highlight
+%{_datadir}/source-highlight/*
 %{_mandir}/man1/*
-%{_infodir}/source-highlight.info*
+%{_infodir}/source-highlight*.info*
+
+%files devel
+%defattr (-,root,root)
+%dir %{_includedir}/srchilite
+%{_libdir}/libsource-highlight.so
+%{_libdir}/pkgconfig/source-highlight.pc
+%{_includedir}/srchilite/*.h
+%{_datadir}/aclocal/ax_boost_*.m4
 
 %changelog
+* Fri Jun 04 2010 Leigh Scott <leigh123linux@googlemail.com> - 3.1.3-1
+- updated to 3.1.3
+- change configure command so it finds boost_regex
+- fix source url's
+- add devel package
+- fix directory ownership
+- fix rpath on binary
+
 * Fri Jan 22 2010 Adrian Reber <adrian@lisas.de> - 2.10-5
 - rebuilt for new boost.
 
diff --git a/sources b/sources
index a7e32a7..7b823da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-03e9cf03580873b76ca0a89f0468b146  source-highlight-2.10.tar.gz
-bf7f58f661d557bb28177e71fc8bf740  source-highlight-2.10.tar.gz.sig
+da08105ba80191fbfacf47999252b274  source-highlight-3.1.3.tar.gz
+86a367ffa7d43d72aa411d974789718b  source-highlight-3.1.3.tar.gz.sig