diff --git a/_service b/_service
deleted file mode 100644
index f5940bf..0000000
--- a/_service
+++ /dev/null
@@ -1,12 +0,0 @@
-<services>
-  <service name="tar_scm">
-    <param name="url">git://5.39.11.196/mailimporter.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">16.07.70git.%ci~%h</param>
-  </service>
-  <service name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" />
-</services>
diff --git a/_service:recompress:tar_scm:mailimporter-16.07.70git.20160320T143716~f45c92a.tar.xz b/_service:recompress:tar_scm:mailimporter-16.07.70git.20160320T143716~f45c92a.tar.xz
deleted file mode 100644
index 069456b..0000000
--- a/_service:recompress:tar_scm:mailimporter-16.07.70git.20160320T143716~f45c92a.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5c026bb236ecdd7b39813bced1f2da1b231a73e4306001f9b81d8b10c47c111
-size 372428
diff --git a/_service:set_version:mailimporter.spec b/_service:set_version:mailimporter.spec
deleted file mode 100644
index 82ab1ec..0000000
--- a/_service:set_version:mailimporter.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-%define version_unconverted 16.07.70git.20160320T143716~f45c92a
-
-Name:           mailimporter
-Version:        16.07.70git.20160320T143716~f45c92a
-Release:        0
-Summary:        Base package of kdepim
-License:        GPL-2.0+ and LGPL-2.1+
-Group:          Development/Libraries
-Url:            http://www.kde.org
-Source0:        %{name}-%{version}.tar.xz
-BuildRequires:  akonadi-calendar-devel
-BuildRequires:  update-desktop-files
-BuildRequires:  akonadi-contact-devel
-BuildRequires:  akonadi-notes-devel
-BuildRequires:  akonadi-mime-devel
-BuildRequires:  cmake(KF5Akonadi)
-BuildRequires:  boost-devel
-BuildRequires:  extra-cmake-modules
-BuildRequires:  kcontacts-devel
-BuildRequires:  kalarmcal-devel
-BuildRequires:  libkdepim-devel
-BuildRequires:  kcalcore-devel
-BuildRequires:  kcalutils-devel 
-BuildRequires:  kcmutils-devel 
-BuildRequires:  kconfig-devel 
-BuildRequires:  kdelibs4support-devel
-BuildRequires:  kf5-filesystem
-BuildRequires:  kimap-devel 
-BuildRequires:  kio-devel
-BuildRequires:  kitemmodels-devel 
-BuildRequires:  kmbox-devel
-BuildRequires:  kmime-devel
-BuildRequires:  knewstuff-devel 
-BuildRequires:  knotifyconfig-devel
-BuildRequires:  kidentitymanagement-devel
-BuildRequires:  kpimtextedit-devel
-BuildRequires:  kross-devel
-BuildRequires:  kwallet-devel
-BuildRequires:  kwidgetsaddons-devel
-BuildRequires:  libkgapi5-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  kmailtransport-devel
-BuildRequires:  kglobalaccel-devel
-BuildRequires:  phonon4qt5-devel
-BuildRequires:  cyrus-sasl-devel
-BuildRequires:  fdupes
-BuildRequires:  gpgme-devel
-BuildRequires:  kactivities5-devel
-BuildRequires:  grantlee5-devel
-BuildRequires:  libassuan-devel
-BuildRequires:  libqca-qt5-devel
-BuildRequires:  link-grammar-devel
-BuildRequires:  akonadi-search-devel
-BuildRequires:  baloo5-widgets-devel
-BuildRequires:  kdewebkit-devel >= 5.0
-BuildRequires:  khtml-devel
-BuildRequires:  kdnssd-framework-devel
-BuildRequires:  ktexteditor-devel
-BuildRequires:  kldap-devel
-BuildRequires:  ktnef-devel
-BuildRequires:  syndication-devel
-BuildRequires:  gpgmepp5-devel
-BuildRequires:  kontactinterface-devel
-BuildRequires:  kblog-devel
-BuildRequires:  kxmlrpcclient5-devel
-BuildRequires:  libprison-devel
-BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Declarative) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5UiTools) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5WebKitWidgets) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5XmlPatterns) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-This package contains the mailimporter library.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%cmake_kf5 -d build 
-
-%make_jobs
-
-%install
-%kf5_makeinstall -C build
-
-%package -n libKF5MailImporter5
-Summary:        MailImporter library for kdepim
-License:        LGPL-2.1+
-Group:          Development/Libraries
-
-%description -n libKF5MailImporter5
-MailImporter Library
-
-%post  -n libKF5MailImporter5 -p /sbin/ldconfig
-
-%postun -n libKF5MailImporter5 -p /sbin/ldconfig
-
-%package devel
-Summary:        Development package for mailimporter
-License:        LGPL-2.1+
-Group:          Development/Libraries
-Requires:       libKF5MailImporter5 = %{version}
-
-%description devel
-The development package for the mailimporter libraries
-
-%files devel
-%defattr(-,root,root)
-%_includedir/KF5/mailimporter/
-%_includedir/KF5/MailImporter/
-%_includedir/KF5/mailimporter_version.h
-%_libdir/cmake/KF5MailImporter/
-%_libdir/libKF5MailImporter.so
-%_libdir/qt5/mkspecs/modules/qt_MailImporter.pri
-
-%files -n libKF5MailImporter5
-%defattr(-,root,root)
-%_libdir/libKF5MailImporter.so.*
-
-
-%changelog
diff --git a/mailimporter-16.03.90.tar.xz b/mailimporter-16.03.90.tar.xz
new file mode 100644
index 0000000..bcfb9a0
--- /dev/null
+++ b/mailimporter-16.03.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b052509faeb6484aae8754f484fb6f1ea9e7f74b178422ce435feb685ac50ab
+size 372264
diff --git a/mailimporter.changes b/mailimporter.changes
new file mode 100644
index 0000000..8ac48a7
--- /dev/null
+++ b/mailimporter.changes
@@ -0,0 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 11 07:15:05 UTC 2016 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 16.03.90
+   * KDE Applications 16.04.0 RC
+   * https://www.kde.org/announcements/announce-applications-16.04-rc.php
+
+
diff --git a/mailimporter.spec b/mailimporter.spec
index 5a2ef6b..3eb49f5 100644
--- a/mailimporter.spec
+++ b/mailimporter.spec
@@ -1,87 +1,106 @@
+#
+# spec file for package mailimporter
+#
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
 Name:           mailimporter
-Version:        4.99.40
+Version:        16.03.90
 Release:        0
 Summary:        Base package of kdepim
 License:        GPL-2.0+ and LGPL-2.1+
+# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Development/Libraries
 Url:            http://www.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  akonadi-calendar-devel
-BuildRequires:  update-desktop-files
 BuildRequires:  akonadi-contact-devel
-BuildRequires:  akonadi-notes-devel
 BuildRequires:  akonadi-mime-devel
-BuildRequires:  cmake(KF5Akonadi)
-BuildRequires:  boost-devel
-BuildRequires:  extra-cmake-modules
-BuildRequires:  kcontacts-devel
-BuildRequires:  kalarmcal-devel
-BuildRequires:  libkdepim-devel
-BuildRequires:  kcalcore-devel
-BuildRequires:  kcalutils-devel 
-BuildRequires:  kcmutils-devel 
-BuildRequires:  kconfig-devel 
-BuildRequires:  kdelibs4support-devel
-BuildRequires:  kf5-filesystem
-BuildRequires:  kimap-devel 
-BuildRequires:  kio-devel
-BuildRequires:  kitemmodels-devel 
-BuildRequires:  kmbox-devel
-BuildRequires:  kmime-devel
-BuildRequires:  knewstuff-devel 
-BuildRequires:  knotifyconfig-devel
-BuildRequires:  kidentitymanagement-devel
-BuildRequires:  kpimtextedit-devel
-BuildRequires:  kross-devel
-BuildRequires:  kwallet-devel
-BuildRequires:  kwidgetsaddons-devel
-BuildRequires:  libkgapi5-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  kmailtransport-devel
-BuildRequires:  kglobalaccel-devel
-BuildRequires:  phonon4qt5-devel
-BuildRequires:  cyrus-sasl-devel
-BuildRequires:  fdupes
-BuildRequires:  gpgme-devel
-BuildRequires:  kactivities5-devel
-BuildRequires:  grantlee5-devel
-BuildRequires:  libassuan-devel
-BuildRequires:  libqca-qt5-devel
-BuildRequires:  link-grammar-devel
+BuildRequires:  akonadi-notes-devel
 BuildRequires:  akonadi-search-devel
 BuildRequires:  baloo5-widgets-devel
-BuildRequires:  kdewebkit-devel >= 5.0
-BuildRequires:  khtml-devel
-BuildRequires:  kdnssd-framework-devel
-BuildRequires:  ktexteditor-devel
-BuildRequires:  kldap-devel
-BuildRequires:  ktnef-devel
-BuildRequires:  syndication-devel
+BuildRequires:  boost-devel
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  fdupes
+BuildRequires:  gpgme-devel
 BuildRequires:  gpgmepp5-devel
-BuildRequires:  kontactinterface-devel
+BuildRequires:  grantlee5-devel
+BuildRequires:  kactivities5-devel
+BuildRequires:  kalarmcal-devel
 BuildRequires:  kblog-devel
+BuildRequires:  kcalcore-devel
+BuildRequires:  kcalutils-devel
+BuildRequires:  kcmutils-devel
+BuildRequires:  kconfig-devel
+BuildRequires:  kcontacts-devel
+BuildRequires:  kdelibs4support-devel
+BuildRequires:  kdewebkit-devel >= 5.0
+BuildRequires:  kdnssd-framework-devel
+BuildRequires:  kf5-filesystem
+BuildRequires:  kglobalaccel-devel
+BuildRequires:  khtml-devel
+BuildRequires:  kidentitymanagement-devel
+BuildRequires:  kimap-devel
+BuildRequires:  kio-devel
+BuildRequires:  kitemmodels-devel
+BuildRequires:  kldap-devel
+BuildRequires:  kmailtransport-devel
+BuildRequires:  kmbox-devel
+BuildRequires:  kmime-devel
+BuildRequires:  knewstuff-devel
+BuildRequires:  knotifyconfig-devel
+BuildRequires:  kontactinterface-devel
+BuildRequires:  kpimtextedit-devel
+BuildRequires:  kross-devel
+BuildRequires:  ktexteditor-devel
+BuildRequires:  ktnef-devel
+BuildRequires:  kwallet-devel
+BuildRequires:  kwidgetsaddons-devel
 BuildRequires:  kxmlrpcclient5-devel
+BuildRequires:  libassuan-devel
+BuildRequires:  libkdepim-devel
+BuildRequires:  libkgapi5-devel
 BuildRequires:  libprison-devel
+BuildRequires:  libqca-qt5-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  link-grammar-devel
+BuildRequires:  phonon4qt5-devel
+BuildRequires:  syndication-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  cmake(KF5Akonadi)
+BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Declarative) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5UiTools) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5WebKitWidgets) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5XmlPatterns) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5XmlPatterns) >= 5.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This package contains the mailimporter library.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
-%cmake_kf5 -d build 
+%cmake_kf5 -d build
 
 %make_jobs
 
@@ -91,18 +110,19 @@ This package contains the mailimporter library.
 %package -n libKF5MailImporter5
 Summary:        MailImporter library for kdepim
 License:        LGPL-2.1+
+# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Development/Libraries
 
 %description -n libKF5MailImporter5
 MailImporter Library
 
 %post  -n libKF5MailImporter5 -p /sbin/ldconfig
-
 %postun -n libKF5MailImporter5 -p /sbin/ldconfig
 
 %package devel
 Summary:        Development package for mailimporter
 License:        LGPL-2.1+
+# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Development/Libraries
 Requires:       libKF5MailImporter5 = %{version}
 
@@ -111,16 +131,15 @@ The development package for the mailimporter libraries
 
 %files devel
 %defattr(-,root,root)
-%_includedir/KF5/mailimporter/
-%_includedir/KF5/MailImporter/
-%_includedir/KF5/mailimporter_version.h
-%_libdir/cmake/KF5MailImporter/
-%_libdir/libKF5MailImporter.so
-%_libdir/qt5/mkspecs/modules/qt_MailImporter.pri
+%{_includedir}/KF5/mailimporter/
+%{_includedir}/KF5/MailImporter/
+%{_includedir}/KF5/mailimporter_version.h
+%{_libdir}/cmake/KF5MailImporter/
+%{_libdir}/libKF5MailImporter.so
+%{_libdir}/qt5/mkspecs/modules/qt_MailImporter.pri
 
 %files -n libKF5MailImporter5
 %defattr(-,root,root)
-%_libdir/libKF5MailImporter.so.*
-
+%{_libdir}/libKF5MailImporter.so.*
 
 %changelog