diff --git a/.gitignore b/.gitignore
index 11b0e2d..75808f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /dnf-plugins-core-20f1035.tar.xz
 /dnf-plugins-core-bca8630.tar.xz
 /dnf-plugins-core-68a05e0.tar.xz
+/dnf-plugins-core-8718a9e.tar.xz
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index 7b593a8..7e8c5a6 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -1,16 +1,19 @@
-%global gitrev 68a05e0
-%global dnf_version 0.4.10-2
-%global pluginspath /usr/share/dnf/plugins
+%global gitrev 8718a9e
+%global dnf_version 0.5.0
 
 Name:		dnf-plugins-core
-Version:	0.0.6
+Version:	0.0.7
 Release:	1%{?dist}
 Summary:	Core Plugins for DNF
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		https://github.com/akozumpl/dnf-plugins-core
-Source0:	http://akozumpl.fedorapeople.org/dnf-plugins-core-%{gitrev}.tar.xz
+
+# source archive is created by running package/archive from a git checkout
+Source0:	dnf-plugins-core-%{gitrev}.tar.xz
+
 BuildArch:	noarch
+BuildRequires:	cmake
 BuildRequires:	dnf >= %{dnf_version}
 BuildRequires:	pykickstart
 BuildRequires:	python-nose
@@ -32,43 +35,81 @@ Requires:	python3-dnf >= %{dnf_version}
 %description -n python3-dnf-plugins-core
 Core Plugins for DNF, Python 3 version.
 
-%build
 
 %prep
 %setup -q -n dnf-plugins-core
+rm -rf py3
+mkdir ../py3
+cp -a . ../py3/
+mv ../py3 ./
+
+%build
+%cmake .
+make %{?_smp_mflags}
+pushd py3
+%cmake -DPYTHON_DESIRED:str=3 .
+make %{?_smp_mflags}
+popd
 
 %install
-%global py2dir %{python_sitelib}/dnf-plugins
-%global py3dir %{python3_sitelib}/dnf-plugins
-
-mkdir -p %{buildroot}/%{py2dir}
-cp -a plugins/builddep.py %{buildroot}/%{py2dir}
-cp -a plugins/debuginfo-install.py %{buildroot}/%{py2dir}
-cp -a plugins/generate_completion_cache.py %{buildroot}/%{py2dir}
-cp -a plugins/kickstart.py %{buildroot}/%{py2dir}
-cp -a plugins/noroot.py %{buildroot}/%{py2dir}
-cp -a plugins/copr.py %{buildroot}/%{py2dir}
-
-mkdir -p %{buildroot}/%{py3dir}
-cp -a plugins/builddep.py %{buildroot}/%{py3dir}
-cp -a plugins/debuginfo-install.py %{buildroot}/%{py3dir}
-cp -a plugins/generate_completion_cache.py %{buildroot}/%{py3dir}
-cp -a plugins/noroot.py %{buildroot}/%{py3dir}
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+pushd py3
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 %check
-
 PYTHONPATH=./plugins nosetests-2.7 -s tests/
 PYTHONPATH=./plugins nosetests-3.3 -s tests/
 
-%files
+%files -f %{name}.lang
 %doc AUTHORS COPYING README.rst
-%{py2dir}/*
+%{python_sitelib}/dnf-plugins/*
+%{python_sitelib}/dnfpluginscore/
 
-%files -n python3-dnf-plugins-core
+%files -n python3-dnf-plugins-core -f %{name}.lang
 %doc AUTHORS COPYING README.rst
-%{py3dir}/*
+%{python3_sitelib}/dnf-plugins/*
+%{python3_sitelib}/dnfpluginscore/
 
 %changelog
+
+* Wed Apr 23 2014 Aleš Kozumplík <ales@redhat.com> - 0.0.7-1
+- build: add cmake as buildreq (Tim Lauridsen)
+- generate-completion-cache: fix shared lib name (Tim Lauridsen)
+- make .spec use gitrev in the source file add helper script for building source archive (Tim Lauridsen)
+- Added transifex config (Tim Lauridsen)
+- tests: use cli logger in kickstart test (Tim Lauridsen)
+- Added translation .pot file Added da translation files so we have something to build & install (Tim Lauridsen)
+- Added CMake files Added CMake build to .spec & and added translation files handling (Tim Lauridsen)
+- make plugins use shared lib added translation wrappers added missing usage & summary PEP8 fixes (Tim Lauridsen)
+- added shared dnfpluginscore lib (Tim Lauridsen)
+- copr: C:139, 0: Unnecessary parens after 'print' keyword (superfluous-parens) (Miroslav Suchý)
+- copr: W: 23, 0: Unused import gettext (unused-import) (Miroslav Suchý)
+- copr: C: 33, 0: No space allowed before : (Miroslav Suchý)
+- copr: some python3 migration (Miroslav Suchý)
+- copr: get rid of dnf i18n imports (Miroslav Suchý)
+- remove dnf.yum.i18n imports. (Ales Kozumplik)
+- copr: Fix the playground upgrade command. (Tadej Janež)
+- copr: implement search function (Igor Gnatenko)
+- better format output (Miroslav Suchý)
+- implement playground plugin (Miroslav Suchý)
+- move removing of repo into method (Miroslav Suchý)
+- check root only for actions which really need root (Miroslav Suchý)
+- move repo downloading into separate method (Miroslav Suchý)
+- define copr url as class attribute (Miroslav Suchý)
+- better wording of warning (Miroslav Suchý)
+- move question to function argument (Miroslav Suchý)
+- move guessing chroot into function (Miroslav Suchý)
+- copr: use common lib use Command.usage & summary cleanup imports & PEP8 fixes (Tim Lauridsen)
+- builddep: added usage & summary & fix some PEP8 issues (Tim Lauridsen)
+- kickstart: use new public Command.usage & Command.summary api (Tim Lauridsen)
+- fix resource leak in builddep.py. (Ales Kozumplik)
+- refactor: command plugins use demands mechanism. (Ales Kozumplik)
+- noroot: move to the new 'demands' mechanism to check the need of root. (Ales Kozumplik)
+- tests: fix locale independence. (Radek Holy)
+- [copr] correctly specify chroot when it should be guessed (Miroslav Suchý)
+
 * Mon Mar 17 2014 Aleš Kozumplík <ales@redhat.com> - 0.0.6-1
 - clenaup: remove commented out code (Miroslav Suchý)
 - copr: list: print description (Igor Gnatenko)
diff --git a/sources b/sources
index 6725ff3..c06cfda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5542ebbdc84d991727b039505d61bec0  dnf-plugins-core-68a05e0.tar.xz
+0e95ab235481f504cafa779e24906340  dnf-plugins-core-8718a9e.tar.xz