diff --git a/.gitignore b/.gitignore
index 2d82901..7b0a11c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /mod_auth_mellon-0.11.0.tar.gz
 /mod_auth_mellon-0.12.0.tar.gz
 /mod_auth_mellon-0.13.1.tar.gz
+/mod_auth_mellon-0.14.0.tar.gz
diff --git a/mod_auth_mellon.spec b/mod_auth_mellon.spec
index 5acf5d0..ec1aeab 100644
--- a/mod_auth_mellon.spec
+++ b/mod_auth_mellon.spec
@@ -1,13 +1,14 @@
 Summary: A SAML 2.0 authentication module for the Apache Httpd Server
 Name: mod_auth_mellon
-Version: 0.13.1
-Release: 2%{?dist}
+Version: 0.14.0
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Source0: https://github.com/UNINETT/mod_auth_mellon/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1: auth_mellon.conf
 Source2: 10-auth_mellon.conf
 Source3: mod_auth_mellon.conf
 Source4: mellon_create_metadata.sh
+Source5: README.redhat.rst
 License: GPLv2+
 BuildRequires: curl-devel
 BuildRequires: glib2-devel
@@ -15,8 +16,9 @@ BuildRequires: httpd-devel
 BuildRequires: lasso-devel >= 2.5.0
 BuildRequires: openssl-devel
 BuildRequires: xmlsec1-devel
+BuildRequires: rubygem-asciidoctor
 Requires: httpd-mmn = %{_httpd_mmn}
-Requires: lasso >= 2.5.0
+Requires: lasso >= 2.5.1
 Url: https://github.com/UNINETT/mod_auth_mellon
 
 
@@ -30,13 +32,22 @@ received in assertions generated by a IdP server.
 
 %build
 export APXS=%{_httpd_apxs}
+%configure --enable-diagnostics
+make clean
+make %{?_smp_mflags}
+cp .libs/%{name}.so %{name}-diagnostics.so
+
 %configure
 make %{?_smp_mflags}
+pushd doc/user_guide
+asciidoctor -a data-uri mellon_user_guide.adoc
+popd
 
 %install
 # install module
 mkdir -p %{buildroot}%{_httpd_moddir}
 install -m 755 .libs/%{name}.so %{buildroot}%{_httpd_moddir}
+install -m 755 %{name}-diagnostics.so %{buildroot}%{_httpd_moddir}
 
 # install module configuration
 mkdir -p %{buildroot}%{_httpd_confdir}
@@ -52,6 +63,26 @@ mkdir -p %{buildroot}/run/%{name}
 mkdir -p %{buildroot}/%{_libexecdir}/%{name}
 install -m 755 %{SOURCE4} %{buildroot}/%{_libexecdir}/%{name}
 
+#install documentation
+mkdir -p %{buildroot}/%{_pkgdocdir}
+
+# install Red Hat README
+install %{SOURCE5} %{buildroot}/%{_pkgdocdir}
+
+# install user guide
+cp -r doc/user_guide %{buildroot}/%{_pkgdocdir}
+
+%package diagnostics
+Summary: Build of mod_auth_mellon with diagnostic logging
+Requires: %{name} = %{version}-%{release}
+
+%description diagnostics
+Build of mod_auth_mellon with diagnostic logging. See README.redhat.rst
+in the doc directory for instructions on using the diagnostics build.
+
+%files diagnostics
+%{_httpd_moddir}/%{name}-diagnostics.so
+
 %files
 %defattr(-,root,root)
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -59,7 +90,9 @@ install -m 755 %{SOURCE4} %{buildroot}/%{_libexecdir}/%{name}
 %else
 %license COPYING
 %endif
-%doc README NEWS ECP.rst
+%doc README.md NEWS ECP.rst
+%doc %{_pkgdocdir}/README.redhat.rst
+%doc %{_pkgdocdir}/user_guide
 %config(noreplace) %{_httpd_modconfdir}/10-auth_mellon.conf
 %config(noreplace) %{_httpd_confdir}/auth_mellon.conf
 %{_httpd_moddir}/mod_auth_mellon.so
@@ -68,6 +101,10 @@ install -m 755 %{SOURCE4} %{buildroot}/%{_libexecdir}/%{name}
 %dir /run/%{name}/
 
 %changelog
+* Thu Apr 19 2018 John Dennis <jdennis@redhat.com> - 0.14.0-1
+- Upgrade to new upstream release
+- Add README.redhat.rst doc explaining packaging of this module.
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 25038ea..6fed013 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mod_auth_mellon-0.13.1.tar.gz) = ad0479be8aa94404a832d11f7ead1f704d86cab2f11aa6f90b895be9b4028026f15ec8ee85260ca76f4a001c115ff14b4b7c9e8da74676a1f0295f6c2f0a1341
+SHA512 (mod_auth_mellon-0.14.0.tar.gz) = db1bf70c234fe89914b1bb34fc6afb5b901193a8c8c7e9946485a3e20a7d129c36427717eab53764edf5a5cff5c45dfe412e400cb1f50c49ef24dbbfd6ecbf25