diff --git a/python-systemd.spec b/python-systemd.spec
index 2e83692..234d7ea 100644
--- a/python-systemd.spec
+++ b/python-systemd.spec
@@ -1,6 +1,6 @@
 Name:           python-systemd
 Version:        231
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module wrapping systemd functionality
 
 License:        LGPLv2+
@@ -31,6 +31,8 @@ Summary:        %{summary}
 Provides:       systemd-python = %{version}-%{release}
 Provides:       systemd-python%{?_isa} = %{version}-%{release}
 Obsoletes:      systemd-python < 230
+Conflicts:      python3-systemd < %{version}-%{release}
+Recommends:	%{name}-doc
 
 %description -n python2-systemd
 Python module for native access to the systemd facilities.
@@ -44,11 +46,12 @@ This is the version for Python 2.
 %package -n python3-systemd
 Summary:        %{summary}
 
-Requires:       js-jquery
 %{?python_provide:%python_provide python3-systemd}
 Provides:       systemd-python3 = %{version}-%{release}
 Provides:       systemd-python3%{?_isa} = %{version}-%{release}
 Obsoletes:      systemd-python3 < 230
+Conflicts:      python2-systemd < %{version}-%{release}
+Recommends:	%{name}-doc
 
 %description -n python3-systemd
 Python module for native access to the systemd facilities.
@@ -59,6 +62,13 @@ provided by libsystemd is also wrapped.
 
 This is the version for Python 3.
 
+%package doc
+Summary:        HTML documentation for %{name}
+Requires:       js-jquery
+
+%description doc
+%{summary}.
+
 %prep
 %autosetup
 
@@ -86,14 +96,23 @@ make PYTHON=%{__python3} check || :
 %files -n python2-systemd
 %license LICENSE.txt
 %doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/html
 %{python2_sitearch}/*
 
 %files -n python3-systemd
 %license LICENSE.txt
 %doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/html
 %{python3_sitearch}/*
 
+%files doc
+%doc %{_pkgdocdir}/html
+
 %changelog
+* Sun Nov 15 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 231-3
+- Split out doc subpackage (#1242619)
+- Do not allow installation of python-systemd in different versions
+
 * Sat Nov 07 2015 Robert Kuska <rkuska@redhat.com> - 231-2
 - Rebuilt for Python3.5 rebuild