diff --git a/python-pysaml2.spec b/python-pysaml2.spec
index 9351c48..cd9a48d 100644
--- a/python-pysaml2.spec
+++ b/python-pysaml2.spec
@@ -1,69 +1,104 @@
 # Created by pyp2rpm-1.1.1
 %global pypi_name pysaml2
+%global commit 27187f6abef2262056977a9a4f7d3042387e4861
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           python-pysaml2
-Version:        2.3.0
-Release:        1%{?dist}
-Summary:        Python implementation of SAML Version 2 to be used in a WSGI environment
-
+Version:        3.0.0
+Release:        0.1.git%{shortcommit}%{?dist}
+Summary:        Python implementation of SAML Version 2
 License:        Apache 2.0
 URL:            https://github.com/rohe/pysaml2
-Source0:        https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+# github tarball to include unreleased fix for
+# https://github.com/rohe/pysaml2/issues/202
+Source0:        https://github.com/rohe/%{pypi_name}/archive/%{commit}/%{pypi_name}-%{commit}.tar.gz
+
 BuildArch:      noarch
  
 BuildRequires:  python-devel
+#mongodict - not in Fedora
 BuildRequires:  python-pyasn1
-BuildRequires:  pymongo
-BuildRequires:  python-memcached
+#pymongo==3.0.1 - 2.5.2 in Fedora
+BuildRequires:  python-pymongo
+BuildRequires:  python-memcached >= 1.51
 BuildRequires:  pytest
 BuildRequires:  python-mako
+BuildRequires:  python-webob
  
+BuildRequires:  python-decorator
+BuildRequires:  python-requests >= 1.0.0
+BuildRequires:  python-paste
+BuildRequires:  python-zope-interface
+BuildRequires:  python-repoze-who
+BuildRequires:  pycrypto >= 2.5
+BuildRequires:  pytz
+BuildRequires:  pyOpenSSL
+BuildRequires:  python-dateutil
+BuildRequires:  python-six
+
 Requires:       python-decorator
 Requires:       python-requests >= 1.0.0
 Requires:       python-paste
 Requires:       python-zope-interface
 Requires:       python-repoze-who
-Requires:       pycrypto >= 2.2
+Requires:       pycrypto >= 2.5
 Requires:       pytz
 Requires:       pyOpenSSL
 Requires:       python-dateutil
-Requires:       python-argparse
+Requires:       python-six
 
 %description
-README for PySAML2 n implementation of SAML Version 2 to be used in a WSGI environment.
+PySAML2 implementation of SAML Version 2 to be used in a WSGI environment.
+
+%package doc
+Summary:        Documentation for Python implementation of SAML Version 2
+
+BuildRequires:  python-sphinx
+
+%description doc
+Documentation for Python implementation of SAML Version 2.
+
 
 %prep
-%setup -q -n %{pypi_name}-%{upstream_version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+%setup -qn %{pypi_name}-%{commit}
+sed -i '/argparse/d' setup.py
 
 %build
 %{__python2} setup.py build
 
+# drop alabaster Sphinx theme, not packaged in Fedora yet
+sed -i '/alabaster/d' doc/conf.py
+# generate html docs
+sphinx-build doc html
+# remove the sphinx-build leftovers
+rm -rf html/.{doctrees,buildinfo}
 
 %install
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
+# some testdeps are missing in Fedora
+#%check
+#%{__python2} setup.py test
 
 %files
-%doc
+%license LICENSE.txt
 %{_bindir}/parse_xsd2.py
 %{_bindir}/make_metadata.py
 %{_bindir}/mdexport.py
 %{_bindir}/merge_metadata.py
-%{python2_sitelib}/saml2/schema
-%{python2_sitelib}/saml2/authn_context
-%{python2_sitelib}/xmlenc
-%{python2_sitelib}/saml2/attributemaps
-%{python2_sitelib}/saml2/extension
-%{python2_sitelib}/saml2/entity_category
-%{python2_sitelib}/saml2/userinfo
-%{python2_sitelib}/saml2/profile
-%{python2_sitelib}/xmldsig
 %{python2_sitelib}/saml2
-%{python2_sitelib}/s2repoze
-%{python2_sitelib}/%{pypi_name}-%{upstream_version}-py?.?.egg-info
+%{python2_sitelib}/*.egg-info
+
+%files doc
+%license LICENSE.txt
+%doc html
 
 %changelog
+* Mon Jun 15 2015 Alan Pevec <apevec@redhat.com> - 3.0.0-0.1
+- include unreleased fix for https://github.com/rohe/pysaml2/issues/202
+
+* Tue Mar 31 2015 Alan Pevec <apevec@redhat.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Mon Feb 16 2015 Dan Prince - 2.3.0-1
 - Initial package.