diff --git a/python-service_identity.changes b/python-service_identity.changes
index 8399372..068515d 100644
--- a/python-service_identity.changes
+++ b/python-service_identity.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jul 21 12:30:36 UTC 2015 - nemysis@gmx.ch
+
+- Change URL
+- Use %{oname} instead of service_identity
+- Add BuildRequires for python-Sphinx for Documentation
+- Change Description
+- Change Documentation add index.html
+- Add Man Page
+
 -------------------------------------------------------------------
 Thu Jul 16 23:49:31 UTC 2015 - jacobwinski@gmail.com
 
diff --git a/python-service_identity.spec b/python-service_identity.spec
index 16e4d76..a580b54 100644
--- a/python-service_identity.spec
+++ b/python-service_identity.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-service_identity
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2014 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -14,30 +14,33 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
+%define oname   service_identity
+
 Name:           python-service_identity
 Version:        14.0.0
 Release:        0
-License:        MIT
 Summary:        Service identity verification for pyOpenSSL
-Url:            https://github.com/hynek/service_identity
+License:        MIT
 Group:          Development/Languages/Python
-Source:         https://pypi.python.org/packages/source/s/service_identity/service_identity-%{version}.tar.gz
-
+Url:            https://github.com/pyca/service_identity
+Source0:        https://pypi.python.org/packages/source/s/%{oname}/%{oname}-%{version}.tar.gz
 BuildRequires:  python-characteristic
 BuildRequires:  python-devel
+BuildRequires:  python-pyOpenSSL >= 0.12
 BuildRequires:  python-pyasn1
 BuildRequires:  python-pyasn1-modules
-BuildRequires:  python-pyOpenSSL >= 0.12
 BuildRequires:  python-setuptools
+# Documentation
+BuildRequires:  python-Sphinx
 
-Requires:  python-characteristic
-Requires:  python-pyasn1
-Requires:  python-pyasn1-modules
-Requires:  python-pyOpenSSL >= 0.12
-Requires:  python-setuptools
-
+Requires:       python-characteristic
+Requires:       python-pyOpenSSL >= 0.12
+Requires:       python-pyasn1
+Requires:       python-pyasn1-modules
+Requires:       python-setuptools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -47,30 +50,34 @@ BuildArch:      noarch
 %endif
 
 %description
-**This software is currently alpha and under review.
-Use it at your own peril.**
+service_identity aspires to give you all the tools you need for
+verifying whether a certificate is valid for the intended purposes.
 
-Any part is subject to change, but feedback is very welcome!
-
-service_identity aspires to give you all the tools you need for verifying
-whether a certificate is valid for the intended purposes.
-
-In the simplest case, this means *host name verification*.  However,
-service_identity implements `RFC 6125`_ fully and plans to add other relevant
-RFCs too.
+In the simplest case, this means host name verification. However,
+service_identity implements RFC 6125 fully and plans to add other
+relevant RFCs too.
 
 %prep
-%setup -q -n service_identity-%{version}
+%setup -q -n %{oname}-%{version}
 
 %build
 python setup.py build
 
+# make man and documentation
+cd docs
+make man singlehtml
+
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+# install man
+install -Dm 0644 docs/_build/man/%{oname}.1 %{buildroot}%{_mandir}/man1/%{oname}.1
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS.rst LICENSE README.rst
-%{python_sitelib}/*
+%doc AUTHORS.rst LICENSE README.rst docs/_build/singlehtml/index.html
+%{_mandir}/man1/%{oname}.1%{ext_man}
+%{python_sitelib}/%{oname}
+%{python_sitelib}/%{oname}-%{version}-py%{py_ver}.egg-info
 
 %changelog