diff --git a/.gitignore b/.gitignore
index 58cb5c6..1d818fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /caja-1.17.1.tar.xz
 /caja-1.17.2.tar.xz
 /caja-1.17.3.tar.xz
+/caja-1.18.0.tar.xz
diff --git a/caja.spec b/caja.spec
index 914968b..cbae68a 100644
--- a/caja.spec
+++ b/caja.spec
@@ -2,7 +2,7 @@
 %global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.17
+%global branch 1.18
 
 # Settings used for build from snapshots.
 %{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652}
@@ -14,9 +14,9 @@
 
 Name:        caja
 Summary:     File manager for MATE
-Version:     %{branch}.3
+Version:     %{branch}.0
 %if 0%{?rel_build}
-Release:     2%{?dist}
+Release:     1%{?dist}
 %else
 Release:     0.4%{?git_rel}%{?dist}
 %endif
@@ -109,14 +109,11 @@ for developing caja extensions.
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
 # disable startup notification
-#sed -i s/StartupNotify=true/StartupNotify=false/g data/caja.desktop.in.in
-#sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-browser.desktop.in.in
 sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-computer.desktop.in.in
-#sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-folder-handler.desktop.in.in
 sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in.in
 
 %patch1 -p1 -b .add-xfce-to-desktop-file
-%patch2 -p1 -b .0001
+#%patch2 -p1 -b .0001
 
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
@@ -230,6 +227,9 @@ fi
 
 
 %changelog
+* Tue Mar 14 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.0-1
+- update to 1.18.0 release
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/caja_0001-Force-X11-backend.patch b/caja_0001-Force-X11-backend.patch
deleted file mode 100644
index 02b9659..0000000
--- a/caja_0001-Force-X11-backend.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 83ceaa5139036498533b941ac96b600e75bceff6 Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux@googlemail.com>
-Date: Sat, 7 Jan 2017 19:15:40 +0000
-Subject: force X11
-
-
-diff --git a/src/caja-main.c b/src/caja-main.c
-index 549dfac..ea29930 100644
---- a/src/caja-main.c
-+++ b/src/caja-main.c
-@@ -266,6 +266,8 @@ main (int argc, char *argv[])
- 
- 	g_set_prgname ("caja");
- 
-+	gdk_set_allowed_backends ("x11");
-+
- 	if (g_file_test (DATADIR "/applications/caja.desktop", G_FILE_TEST_EXISTS)) {
- 		egg_set_desktop_file (DATADIR "/applications/caja.desktop");
- 	}
--- 
-cgit v0.10.2
-
-
diff --git a/sources b/sources
index f5bb37e..a7b1c12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (caja-1.17.3.tar.xz) = 3120dc0dfb563f4d4cbb75f095b4a5ce86a6b5ce1d19b16442373ee3be936291af06d2ebf3dce88d51b6d641aa1479e0fc890cd876dfb2fc02908a05591a9206
+SHA512 (caja-1.18.0.tar.xz) = d685b685f35530c730e4cdfc5c1fbf8abc813aab353a25943a0978da5603d9c9df234da88ee46c09cfb72c8c9e5f1f3a4a2d1b1dbd07c85555169fb1861a201f