diff --git a/.gitignore b/.gitignore
index 04f68c1..2fc47f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ rpmconf-0.2.2.tar.gz
 /rpmconf-1.0.2.tar.gz
 /rpmconf-1.0.3.tar.gz
 /rpmconf-1.0.4.tar.gz
+/rpmconf-1.0.6.tar.gz
diff --git a/rpmconf.spec b/rpmconf.spec
index ae4c336..99980e9 100644
--- a/rpmconf.spec
+++ b/rpmconf.spec
@@ -1,28 +1,42 @@
-Name: rpmconf
-Summary: Tool to handle rpmnew and rpmsave files
-Group:   Applications/System
-License: GPLv3
-Version: 1.0.4
-Release: 1%{?dist}
-URL:     http://wiki.github.com/xsuchy/rpmconf
-Source0: http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRequires: docbook-utils
-BuildRequires: docbook-dtd31-sgml
-BuildRequires: python3-pylint
-Requires: %{name}-base
-Requires: rpm-python3
-# just because of pylint
-BuildRequires: rpm-python3
+Name:           rpmconf
+Summary:        Tool to handle rpmnew and rpmsave files
+License:        GPLv3
+Version:        1.0.6
+Release:        1%{?dist}
+URL:            http://wiki.github.com/xsuchy/rpmconf
+Source0:        http://cloud.github.com/downloads/xsuchy/rpmconf/%{name}-%{version}.tar.gz
+BuildArch:      noarch
+BuildRequires:  docbook-utils
+BuildRequires:  docbook-dtd31-sgml
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-pylint
+BuildRequires:  python3-devel
+Requires:       %{name}-base
+Requires:       python3-rpmconf
+Requires:       rpm-python3
+BuildRequires:  rpm-python3
 
 %description
 This tool search for .rpmnew, .rpmsave and .rpmorig files and ask you what to do
 with them:
 Keep current version, place back old version, watch the diff or merge.
 
+%package -n python3-rpmconf
+Summary:        Python interface for %{name}
+BuildArch:      noarch
+
+%description -n python3-rpmconf
+Python interface for %{name}. Mostly useful for developers only.
+
+%package -n python3-rpmconf-doc
+Summary:        Documentation of python interface for %{name}
+BuildArch:      noarch
+
+%description -n python3-rpmconf-doc
+Documentation generated from code of python3-rpmconf.
+
 %package base
 Summary: Filesystem for %{name}
-Group: Applications/System
 BuildArch: noarch
 
 %description base
@@ -32,26 +46,50 @@ Directory hierarchy for installation scripts, which are handled by rpmconf.
 %setup -q
 
 %build
+%{__python3} setup.py build
 docbook2man rpmconf.sgml
+make -C docs html man
 
 %install
-install -D -m 755 rpmconf.py %{buildroot}%{_sbindir}/rpmconf
+%{__python3} setup.py install --skip-build \
+    --install-scripts %{_sbindir} \
+    --root %{buildroot}
 install -D -m 644 rpmconf.8 %{buildroot}%{_mandir}/man8/rpmconf.8
-
-mkdir %{buildroot}%{_datadir}/rpmconf
+install -D -m 644 docs/build/man/rpmconf.3 %{buildroot}%{_mandir}/man3/rpmconf.3
+mkdir -p %{buildroot}%{_datadir}/rpmconf/
 
 %check
 python3-pylint --reports=n %{buildroot}%{_sbindir}/rpmconf
+python3-pylint --reports=n %{buildroot}%{python3_sitelib}/rpmconf/rpmconf.py
 
 %files
+%license LICENSE
 %{_sbindir}/rpmconf
 %{_mandir}/man8/rpmconf.8*
-%doc LICENSE
+
+%files -n python3-rpmconf
+%license LICENSE
+%{python3_sitelib}/rpmconf/
+%{python3_sitelib}/rpmconf-*.egg-info
+%{_mandir}/man3/rpmconf.3*
+
+%files -n python3-rpmconf-doc
+%license LICENSE
+%doc docs/build/html/
 
 %files base
 %dir %{_datadir}/rpmconf
 
 %changelog
+* Thu Jan 08 2015 Miroslav Suchý <msuchy@redhat.com> 1.0.6-1
+- remove superfluous changelog line
+
+* Thu Jan 08 2015 Miroslav Suchý <miroslav@suchy.cz> 1.0.5-1
+- add -doc subpackage
+- mark LICENSE as %%license
+- Split to python class and CLI
+- use rpm python api to get version
+
 * Sun Nov 23 2014 Miroslav Suchý <msuchy@redhat.com> 1.0.4-1
 - add BR rpm-python3
 
diff --git a/sources b/sources
index 32bfcfe..d4e0b97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a620249c6a678057e5a3155fa47df07f  rpmconf-1.0.4.tar.gz
+c27a1c622e2470ad2400136b21988752  rpmconf-1.0.6.tar.gz