diff --git a/ibus-vala-0.18.patch b/ibus-vala-0.18.patch
deleted file mode 100644
index 1f1f395..0000000
--- a/ibus-vala-0.18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ibus-1.5.8/configure.ac
-===================================================================
---- ibus-1.5.8.orig/configure.ac
-+++ ibus-1.5.8/configure.ac
-@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY)
- AC_PROG_CC
- AM_PROG_CC_C_O
- AC_PROG_CC_STDC
--AM_PROG_VALAC([0.20])
-+AM_PROG_VALAC([0.18])
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
diff --git a/ibus.changes b/ibus.changes
index 05dd4aa..cfe41d8 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Mar 12 14:41:40 UTC 2017 - dimstar@opensuse.org
+
+- Drop ibus-vala-0.36.patch: No longer needed, since vala 0.36
+  re-introduced the compatibility layer.
+
+-------------------------------------------------------------------
+Wed Mar  1 14:25:29 UTC 2017 - zaitor@opensuse.org
+
+- Drop ibus-vala-0.18.patch: No longer needed.
+
+-------------------------------------------------------------------
+Wed Mar  1 13:16:08 UTC 2017 - dimstar@opensuse.org
+
+- Add ibus-vala-0.36.patch: Fix build with vala 0.36, which is
+  stricter in its binding usage. Patch only respective vala
+  versions.
+
 -------------------------------------------------------------------
 Wed Dec 28 15:04:47 UTC 2016 - hillwood@opensuse.org
 
diff --git a/ibus.spec b/ibus.spec
index 31329e8..928373f 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ibus
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -58,9 +58,6 @@ Patch4:         ibus-xim-fix-re-focus-after-lock.patch
 # is enabled, and fix syntax errors in python-config.py
 Patch5:         ibus-force-python3.patch
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org
-# lower vala version
-Patch6:         ibus-vala-0.18.patch
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org
 Patch7:         ibus-python3-migration.patch
 # PATCH-FIX-UPSTREAM ftake@geeko.jp
 # Select an IM engine at the first login
@@ -241,7 +238,6 @@ docs for ibus.
 
 # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
 %if 0%{?suse_version} < 1310
-%patch6 -p1
 sed -i \
     -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
     -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \