diff --git a/coccinelle-1.0.0-rc21.tgz b/coccinelle-1.0.0-rc21.tgz
deleted file mode 100644
index 975a28c..0000000
--- a/coccinelle-1.0.0-rc21.tgz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6609a1f800f84d058c9b395edd0597171594b685f551a9b9c03728a1b416783
-size 2539510
diff --git a/coccinelle-1.0.0-rc22.tgz b/coccinelle-1.0.0-rc22.tgz
new file mode 100644
index 0000000..bf8ca1f
--- /dev/null
+++ b/coccinelle-1.0.0-rc22.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:004a1a6f35fcf27bf6a63db92e3a3ba64552a4f8e0a41a83352e934eefa6e87a
+size 2624506
diff --git a/coccinelle.changes b/coccinelle.changes
index c81dcc6..e58518a 100644
--- a/coccinelle.changes
+++ b/coccinelle.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct  2 15:01:42 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 1.0.0~rc22
+* Limited matching of decimal format strings, with the --ibm option
+* Better support for functions that have no specified return type.
+- Drop fix-no_prepare_ocamlcocci-arguments.patch (merged)
+
 -------------------------------------------------------------------
 Thu Sep  9 14:25:25 UTC 2013 - mcgrof@suse.com
 
diff --git a/coccinelle.spec b/coccinelle.spec
index 63c258a..a331845 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -17,18 +17,18 @@
 
 
 Name:           coccinelle
-Version:        1.0.0~rc21
+Version:        1.0.0~rc22
 Release:        0
 Summary:        Semantic patch utility
 License:        GPL-2.0
 Group:          Productivity/Text/Utilities
 Url:            http://coccinelle.lip6.fr/
-%define rversion	1.0.0-rc21
+%define rversion	1.0.0-rc22
 
 #Git-Clone:	git://github.com/coccinelle/coccinelle
 Source:         http://coccinelle.lip6.fr/distrib/%name-%rversion.tgz
-Patch1:         fix-no_prepare_ocamlcocci-arguments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
 BuildRequires:  ocaml >= 3.11
 BuildRequires:  ocaml-camlp4-devel >= 3.11
@@ -54,7 +54,6 @@ used (by us and others) for finding and fixing bugs in systems code.
 
 %prep
 %setup -qn %name-%rversion
-%patch -P 1 -p1
 
 %build
 %configure
@@ -77,6 +76,9 @@ rm -Rf "$b/%_datadir/%name"/{commons,globals,ocaml,parsing_c} \
 
 mkdir -p "$b/%_libdir";
 mv "$b/%_datadir/%name/dllpycaml_stubs.so" "$b/%_libdir/";
+mv "$b/%_datadir/%name/spatch" "$b/%_bindir/spatch.bin"
+ln -s spatch.bin "$b/%_datadir/%name/spatch"
+%fdupes %buildroot/%_prefix
 
 %files
 %defattr(-,root,root)
@@ -85,6 +87,6 @@ mv "$b/%_datadir/%name/dllpycaml_stubs.so" "$b/%_libdir/";
 %doc %_mandir/man?/*
 %_bindir/spatch*
 %_libdir/dllpycaml_stubs.so
-%_datadir/%name
+%_datadir/%name/
 
 %changelog
diff --git a/fix-no_prepare_ocamlcocci-arguments.patch b/fix-no_prepare_ocamlcocci-arguments.patch
deleted file mode 100644
index fbe2fd6..0000000
--- a/fix-no_prepare_ocamlcocci-arguments.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-Date: Tue, 9 Sep 2014 15:10:42 -0700
-X-Upstream: should appear in 1.0.0~rc22
-
-The functions do take five arguments, but these two call sites erroneously
-just passed four.
-
---- a/ocaml/no_prepare_ocamlcocci.ml
-+++ b/ocaml/no_prepare_ocamlcocci.ml
-@@ -9,9 +9,9 @@
- 	function
- 	    Ast_cocci.ScriptRule (name,"ocaml",deps,mv,script_vars,code) ->
- 	      code :: prev
--	  | Ast_cocci.InitialScriptRule (name,"ocaml",deps,code) ->
-+	  | Ast_cocci.InitialScriptRule (name,"ocaml",deps,mvs,code) ->
- 	      code :: prev
--	  | Ast_cocci.FinalScriptRule (name,"ocaml",deps,code) ->
-+	  | Ast_cocci.FinalScriptRule (name,"ocaml",deps,mvs,code) ->
- 	      code :: prev
- 	  | _ -> prev)
-       [] code in