diff --git a/kdav-17.12.3.tar.xz b/kdav-17.12.3.tar.xz
deleted file mode 100644
index 09ef98a..0000000
--- a/kdav-17.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4d3d683faf3310dd723e987bbab24ee8e31a36d004004312905053ba6132a90
-size 37796
diff --git a/kdav-18.04.0.tar.xz b/kdav-18.04.0.tar.xz
new file mode 100644
index 0000000..5d09ed8
--- /dev/null
+++ b/kdav-18.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22c324c84aac61c5cf0bf353188b35a66278bec64ca4786291ddaab104a52b95
+size 48760
diff --git a/kdav.changes b/kdav.changes
index 0a108f7..4242263 100644
--- a/kdav.changes
+++ b/kdav.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Wed Apr 18 07:48:58 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.04.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.04.0.php
+- Changes since 18.03.90:
+  * None
+
+-------------------------------------------------------------------
+Fri Apr 06 07:09:11 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.03.90
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.03.90.php
+- Changes since 17.12.3:
+  * Use QLAtin1String
+  * Use QLatin1String
+  * Use QLatin1String
+  * Use QLAtin1String
+  * Use QLatin1Char
+  * Use new connect api
+  * Fix string: MIME types
+  * Port to for(...:...)
+  * Unused file
+  * Use QVector
+  * Don't forget to include CMakeFindDependencyMacro.
+
 -------------------------------------------------------------------
 Thu Mar 08 23:51:24 CET 2018 - lbeltrame@kde.org
 
diff --git a/kdav.spec b/kdav.spec
index a1ea94d..f8b90da 100644
--- a/kdav.spec
+++ b/kdav.spec
@@ -16,8 +16,10 @@
 #
 
 
+%bcond_without	lang
+
 Name:           kdav
-Version:        17.12.3
+Version:        18.04.0
 Release:        0
 Summary:        DAV protocol implementation
 License:        GPL-2.0-only
@@ -26,14 +28,13 @@ Url:            http://www.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  extra-cmake-modules
 BuildRequires:  cmake(KF5CoreAddons)
+BuildRequires:  cmake(KF5I18n)
 BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5XmlPatterns)
-%if %{with lang}
 Recommends:     %{name}-lang
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,6 +58,8 @@ Requires:       libKPimKDAV5 = %{version}
 %description devel
 This package contains development files needed to use kdav in other applications.
 
+%lang_package
+
 %prep
 %setup -q
 
@@ -66,6 +69,9 @@ This package contains development files needed to use kdav in other applications
 
 %install
 %kf5_makeinstall -C build
+  %if %{with lang}
+    %find_lang %{name} --with-man --all-name
+  %endif
 
 %post -n libKPimKDAV5 -p /sbin/ldconfig
 
@@ -89,4 +95,9 @@ This package contains development files needed to use kdav in other applications
 %{_kf5_libdir}/libKPimKDAV.so
 %{_kf5_mkspecsdir}/qt_kdav.pri
 
+%if %{with lang}
+%files lang -f %{name}.lang
+%license COPYING*
+%endif
+
 %changelog