diff --git a/.gitignore b/.gitignore
index faab909..eb6a64a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/akonadi-15.12.2.tar.xz
-/akonadi-15.12.3.tar.xz
+/akonadi-16.04.0.tar.xz
diff --git a/kf5-akonadi-server.spec b/kf5-akonadi-server.spec
index 992aee8..ef8c3b2 100644
--- a/kf5-akonadi-server.spec
+++ b/kf5-akonadi-server.spec
@@ -12,13 +12,20 @@
 %global mysql mariadb
 %endif
 
+# uncomment to enable bootstrap mode
+#global bootstrap 1
+
+%if !0%{?bootstrap}
+%global tests 1
+%endif
+
 Name:    kf5-%{framework}
 Summary: PIM Storage Service
-Version: 15.12.3
-Release: 3%{?dist}
+Version: 16.04.0
+Release: 1%{?dist}
 
 License: LGPLv2+
-URL:     https://projects.kde.org/akonadi
+URL:     https://quickgit.kde.org/?p=%{framework}.git
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -52,6 +59,12 @@ BuildRequires:  pkgconfig(sqlite3) >= 3.6.23
 BuildRequires:  mariadb-server
 BuildRequires:  postgresql-server
 
+%if 0%{?tests}
+BuildRequires: dbus-x11
+BuildRequires: time
+BuildRequires: xorg-x11-server-Xvfb
+%endif
+
 Requires:       kf5-filesystem
 
 Recommends:     %{name}-mysql = %{version}-%{release}
@@ -66,6 +79,7 @@ Summary:        Developer files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 # at least dbus-1/interfaces conflict, maybe more -- rex
 Conflicts:      akonadi-devel
+Conflicts:      kf5-akonadi-devel < 16.03
 %description devel
 %{summary}.
 
@@ -101,7 +115,8 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} .. \
   %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
-  -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON
+  -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \
+  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -130,6 +145,16 @@ install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akona
 rm -fv %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
 
 
+%check
+%if 0%{?tests}
+export CTEST_OUTPUT_ON_FAILURE=1
+xvfb-run -a \
+dbus-launch --exit-with-session \
+time \
+make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
+%endif
+
+
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
@@ -146,7 +171,7 @@ fi
 
 %files
 %doc AUTHORS README
-%license lgpl-license
+%license COPYING*
 %dir %{_sysconfdir}/xdg/akonadi/
 %ghost %config(missingok,noreplace) %{_sysconfdir}/xdg/akonadi/akonadiserverrc
 %{_sysconfdir}/xdg/akonadi.categories
@@ -157,18 +182,43 @@ fi
 %{_kf5_bindir}/akonadictl
 %{_kf5_bindir}/akonadiserver
 %{_kf5_libdir}/akonadi/
-%{_kf5_libdir}/libKF5AkonadiPrivate.so.*
 %{_kf5_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_kf5_datadir}/mime/packages/akonadi-mime.xml
 %{_kf5_datadir}/akonadi/
+%{_kf5_datadir}/config.kcfg/resourcebase.kcfg
+%{_kf5_datadir}/kf5/akonadi/
+%{_kf5_qtplugindir}/akonadi/
+%{_kf5_qtplugindir}/designer/akonadi5widgets.so
 %{_kf5_qtplugindir}/sqldrivers/libqsqlite3.so
+%{_kf5_libdir}/libKF5AkonadiAgentBase.so.5*
+%{_kf5_libdir}/libKF5AkonadiCore.so.5*
+%{_kf5_libdir}/libKF5AkonadiPrivate.so.5*
+%{_kf5_libdir}/libKF5AkonadiWidgets.so.5*
+%{_kf5_libdir}/libKF5AkonadiXml.so.5*
 
 %files devel
+%{_kf5_bindir}/akonadi2xml
+%{_kf5_bindir}/akonadiselftest
+%{_kf5_bindir}/akonaditest
 %{_kf5_bindir}/asapcat
+
+%{_kf5_bindir}/akonadi_knut_resource
+%{_kf5_datadir}/kf5/akonadi_knut_resource/
+
 %{_kf5_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
+%{_kf5_includedir}/akonadi_version.h
 %{_kf5_includedir}/akonadi/
+%{_kf5_includedir}/AkonadiAgentBase/
+%{_kf5_includedir}/AkonadiCore/
+%{_kf5_includedir}/AkonadiWidgets/
+%{_kf5_includedir}/AkonadiXml/
+%{_kf5_libdir}/libKF5AkonadiAgentBase.so
+%{_kf5_libdir}/libKF5AkonadiCore.so
 %{_kf5_libdir}/libKF5AkonadiPrivate.so
-%{_kf5_libdir}/cmake/KF5AkonadiServer/
+%{_kf5_libdir}/libKF5AkonadiWidgets.so
+%{_kf5_libdir}/libKF5AkonadiXml.so
+%{_kf5_libdir}/cmake/KF5Akonadi/
+%{_kf5_archdatadir}/mkspecs/modules/qt_Akonadi*.pri
 
 %post mysql
 %{_sbindir}/update-alternatives \
@@ -191,6 +241,9 @@ fi
 
 
 %changelog
+* Sat Apr 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 16.04.0-1
+- 16.04.0, update URL, support bootstrap, add %%check
+
 * Mon Mar 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 15.12.3-3
 - -mysql: Provides: akonadi-mysql
 
diff --git a/sources b/sources
index 8a4db43..04b5f43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5948bf5efa896269e14c5bb4ca3b1322  akonadi-15.12.3.tar.xz
+7151e11069ff50be77633721b19f2439  akonadi-16.04.0.tar.xz