diff --git a/disable-OOM-protection.patch b/disable-OOM-protection.patch
new file mode 100644
index 0000000..15df0de
--- /dev/null
+++ b/disable-OOM-protection.patch
@@ -0,0 +1,13 @@
+diff --git a/src/start_kdeinit/CMakeLists.txt b/src/start_kdeinit/CMakeLists.txt
+index 73e50b8..e84e6a9 100644
+--- a/src/start_kdeinit/CMakeLists.txt
++++ b/src/start_kdeinit/CMakeLists.txt
+@@ -4,7 +4,7 @@ add_executable(start_kdeinit_wrapper start_kdeinit_wrapper.c)
+ install(TARGETS start_kdeinit DESTINATION ${KF5_LIBEXEC_INSTALL_DIR})
+ install(TARGETS start_kdeinit_wrapper DESTINATION ${KF5_LIBEXEC_INSTALL_DIR})
+ 
+-if (CMAKE_SYSTEM_NAME MATCHES Linux)
++if (0)
+     MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
+     set(KDEINIT_OOM_PROTECT 1)
+     install(CODE "
diff --git a/kinit-4.98.0.tar.xz b/kinit-4.98.0.tar.xz
deleted file mode 100644
index e340489..0000000
--- a/kinit-4.98.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:691b0f3c0f0b37c74992969da74f60cc1eb1bdb047f59c851e7631b73da8049e
-size 53464
diff --git a/kinit-4.99.0.tar.xz b/kinit-4.99.0.tar.xz
new file mode 100644
index 0000000..2821b10
--- /dev/null
+++ b/kinit-4.99.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d017bcadd4c089c7ee76a4a2a7d33a24479972c453be53119f70283cfa716d8f
+size 2792356
diff --git a/kinit.changes b/kinit.changes
index 4201653..f8184ba 100644
--- a/kinit.changes
+++ b/kinit.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun May  4 01:41:14 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 4.99.0
+  * API improvements and cleanups
+  * Buildsystem fixes
+  * For more details please see:
+    http://www.kde.org/announcements/announce-frameworks5-beta2.php
+- Added kdoctools-devel BuildRequires
+
+-------------------------------------------------------------------
+Tue Apr 22 19:17:57 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Added disable-OOM-protection.patch: it was not proved to be
+  needed feature, and creates potential security risk, bnc#862953
+- Drop unused and commented out parts of the spec
+
 -------------------------------------------------------------------
 Sat Mar 29 19:47:41 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/kinit.spec b/kinit.spec
index d17db2c..09bcf56 100644
--- a/kinit.spec
+++ b/kinit.spec
@@ -17,29 +17,30 @@
 
 
 Name:           kinit
-Version:        4.98.0
+Version:        4.99.0
 Release:        0
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 0.0.12
+BuildRequires:  extra-cmake-modules >= 0.0.13
 BuildRequires:  fdupes
 BuildRequires:  kcrash-devel >= %{_kf5_version}
 BuildRequires:  kf5-filesystem
 BuildRequires:  ki18n-devel >= %{_kf5_version}
+BuildRequires:  kdoctools-devel >= %{_kf5_version}
 BuildRequires:  kio-devel >= %{_kf5_version}
 BuildRequires:  kservice-devel >= %{_kf5_version}
 BuildRequires:  kwindowsystem-devel >= %{_kf5_version}
-BuildRequires:  libcap-devel
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Gui) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
 BuildRequires:  pkgconfig(x11)
-#PreReq:         permissions
 Summary:        Helper library to speed up start of applications on KDE workspaces
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source0:        kinit-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM disable-OOM-protection.patch -- it was not proved to be needed feature, and create potential security risk, bnc#862953
+Patch0:         disable-OOM-protection.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -58,6 +59,7 @@ booting UNIX. Development files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
   %cmake_kf5 -d build -- -DCMAKE_CXX_FLAGS="%{optflags} -fpie" -DCMAKE_C_FLAGS="%{optflags} -fpie" -DCMAKE_SHARED_LINKER_FLAGS="-pie" -DCMAKE_EXE_LINKER_FLAGS="-pie" -DCMAKE_MODULE_LINKER_FLAGS="-pie"
@@ -67,19 +69,9 @@ booting UNIX. Development files.
   %kf5_makeinstall -C build
   %fdupes -s %{buildroot}
 
-# Under security review -- bnc#862953
-# echo "setBadness('permissions-file-setuid-bit', 998)" > $RPM_SOURCE_DIR/%name-rpmlintrc
+%post -p /sbin/ldconfig
 
-%post
-/sbin/ldconfig
-
-#set_permissions %{_kf5_libexecdir}/start_kdeinit
-
-%postun
-/sbin/ldconfig
-
-#verifyscript
-#verify_permissions -e %{_kf5_libexecdir}/start_kdeinit
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -91,9 +83,9 @@ booting UNIX. Development files.
 %{_kf5_libdir}/libkdeinit5_klauncher.so
 %{_kf5_libexecdir}/klauncher
 %{_kf5_bindir}/kshell5
-#verify(not mode caps) %attr(4755,root,root) %{_kf5_libexecdir}/start_kdeinit
 %{_kf5_libexecdir}/start_kdeinit
 %{_kf5_libexecdir}/start_kdeinit_wrapper
+%{_kf5_mandir}/man8/kdeinit5.*
 
 %files devel
 %defattr(-,root,root)