diff --git a/.gitignore b/.gitignore
index 139511c..1968fae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 keepassx-0.4.3.tar.gz
 /keepassx-2.0.0.tar.gz
 /keepassx-0.4.4.tar.gz
+/keepassx-2.0.2.tar.gz
diff --git a/keepassx.spec b/keepassx.spec
index 34c4ae9..d1b0c3f 100644
--- a/keepassx.spec
+++ b/keepassx.spec
@@ -1,16 +1,15 @@
 Name:           keepassx
 Epoch:          1
-Version:        0.4.4
+Version:        2.0.2
 Release:        1%{?dist}
 Summary:        Cross-platform password manager
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://keepassx.sourceforge.net
-Source0:        http://download.sf.net/keepassx/keepassx-%{version}.tar.gz
-Patch1:         keepassx-0.3.3-gcc43.patch
-Patch2:         keepassx-0.4.3-gcc47.patch
-BuildRequires:  qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils
-Requires:       hicolor-icon-theme
+URL:            http://www.keepassx.org/
+Source0: https://github.com/keepassx/keepassx/archive/%{version}.tar.gz#/keepassx-%{version}.tar.gz
+BuildRequires:  qt-devel >= 4.6, libXtst-devel, desktop-file-utils, libgcrypt-devel, zlib-devel, cmake >= 2.6.4
+BuildRequires:  gettext
+Requires:       hicolor-icon-theme, qt >= 4.6
 
 %description
 KeePassX is an application for people with extremly high demands on secure
@@ -30,47 +29,38 @@ information can be considered as quite safe. KeePassX uses a database format
 that is compatible with KeePass Password Safe for MS Windows.
 
 %prep
-%setup -q
-%patch1 -p0 -b .gcc43
-%patch2 -p1 -b .gcc47
+%setup -qn keepassx-%{version}
+
+sed -i s/keepassx/keepassx2/g CMakeLists.txt
+sed -i s/keepassx/keepassx2/g share/linux/keepassx.desktop
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
-qmake-qt4 PREFIX=%{_prefix}
-make %{?_smp_mflags}
+%cmake .
 
 %install
-make install INSTALL_ROOT=$RPM_BUILD_ROOT
-
-# Use png in _datadir/icons/hicolor instead of xpm in pixmaps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
-convert $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/keepassx.png
-rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm
-
-# Menu
-sed -i -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --delete-original \
-        --add-mime-type application/x-keepass \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%make_install
 
 # Associate KDB files
 cat > x-keepass.desktop << EOF
 [Desktop Entry]
 Comment=
 Hidden=false
-Icon=keepassx.png
+Icon=keepassx2.png
 MimeType=application/x-keepass
-Patterns=*.kdb;*.KDB
+Patterns=*.kdb;*.KDB;*.kdbx;*.KDBX
 Type=MimeType
 EOF
 install -D -m 644 -p x-keepass.desktop \
-  $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-keepass.desktop
+  %{buildroot}%{_datadir}/mimelnk/application/x-keepass2.desktop
+
+mv %{buildroot}%{_datadir}/applications/keepassx.desktop %{buildroot}%{_datadir}/applications/keepassx2.desktop
+mv %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/keepassx.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/keepassx2.png
+mv %{buildroot}%{_datadir}/mime/packages/keepassx.xml %{buildroot}%{_datadir}/mime/packages/keepassx2.xml
+
+%find_lang keepassx --with-qt
 
+%check
+ctest -V %{?_smp_mflags}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -89,17 +79,23 @@ update-desktop-database &> /dev/null ||:
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-%files
-%doc share/keepassx/license.html
-%{_bindir}/keepassx
-%{_datadir}/keepassx
+desktop-file-validate %{_datadir}/applications/keepassx2.desktop &> /dev/null || :
+
+%files -f keepassx.lang
+%doc README.md CHANGELOG
+%license COPYING LICENSE.*
+%{_bindir}/keepassx2
+%{_libdir}/keepassx2/libkeepassx*.so
+%{_datadir}/keepassx2/icons
 %{_datadir}/applications/*.desktop
 %{_datadir}/mimelnk/application/*.desktop
 %{_datadir}/mime/packages/*.xml
-%{_datadir}/icons/hicolor/*/apps/keepassx.png
+%{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Apr 25 2016 Jon Ciesla <limburgher@gmail.com> - 1:2.0.2-1
+- Move back to 2.0.2, FESCO 1569.
+
 * Wed Apr 13 2016 Jon Ciesla <limburgher@gmail.com> - 1:0.4.4-1
 - Revert to 0.4.x, incompatible db change.
 
diff --git a/sources b/sources
index 9761508..50824f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6022ffe1e2c59fc6f1a47544417bb0b5  keepassx-0.4.4.tar.gz
+65d098dff663768911847a1e92d0f01d  keepassx-2.0.2.tar.gz