diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..1986d4f
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<constraints>
+  <sandbox>kvm</sandbox>
+</constraints>
diff --git a/orc-0.4.18.tar.gz b/orc-0.4.18.tar.gz
deleted file mode 100644
index 969bdbf..0000000
--- a/orc-0.4.18.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34d3c8a7259f42bed4dcfbc106c5e3d0cc8e17eeaa73128d1c5eaf92883a6a24
-size 732377
diff --git a/orc-0.4.22.tar.xz b/orc-0.4.22.tar.xz
new file mode 100644
index 0000000..31e58f5
--- /dev/null
+++ b/orc-0.4.22.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04ca077f4b25f02cc13090effa55343bbfde986c8d663df430347992aa5cf935
+size 445792
diff --git a/orc-disable-test-limits.patch b/orc-disable-test-limits.patch
new file mode 100644
index 0000000..7f64bc2
--- /dev/null
+++ b/orc-disable-test-limits.patch
@@ -0,0 +1,14 @@
+Index: orc-0.4.21/testsuite/Makefile.am
+===================================================================
+--- orc-0.4.21.orig/testsuite/Makefile.am
++++ orc-0.4.21/testsuite/Makefile.am
+@@ -12,8 +12,7 @@ TESTS = \
+ 	exec_parse \
+ 	perf_opcodes_sys perf_parse \
+ 	memcpy_speed \
+-	abi \
+-	test-limits
++	abi
+ 
+ noinst_PROGRAMS = $(TESTS) generate_xml_table generate_xml_table2 \
+ 	generate_opcodes_sys compile_parse compile_parse_c memcpy_speed \
diff --git a/orc.changes b/orc.changes
index 6364ed1..451e62b 100644
--- a/orc.changes
+++ b/orc.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Sep 17 11:14:54 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 0.4.22:
+  + Handle NOCONFIGURE=1 in autogen.sh.
+  + Some memory leak fixes in the compiler.
+  + Fixes for compiler warnings on Win64.
+  + Properly detect CPU features on Android in non-debug build.
+  + Use Android logging system instead of stderr for debug output.
+
+-------------------------------------------------------------------
+Fri Jul  4 07:57:28 UTC 2014 - idonmez@suse.com
+
+- Update to version 0.4.21
+  + Fix memory leaks
+  + Fix list corruption when splitting code memory chunks,
+    causing crashes when allocating a lot of code memory and trying
+    to free it later
+  + Various compiler warnings, coverity warnings and static code
+    analysis fixes
+  + Documentation fix for mulhsw, mulhuw
+- Add orc-disable-test-limits.patch to disable test-limits test,
+  it only works on x86-64
+
 -------------------------------------------------------------------
 Fri Dec 20 16:14:22 UTC 2013 - zaitor@opensuse.org
 
diff --git a/orc.spec b/orc.spec
index bdfd03c..848671d 100644
--- a/orc.spec
+++ b/orc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package orc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,15 +18,19 @@
 
 
 Name:           orc
+Version:        0.4.22
+Release:        0
 Summary:        The Oil Runtime Compiler
 License:        BSD-3-Clause
 Group:          Productivity/Multimedia/Other
-Version:        0.4.18
-Release:        0
-Url:            http://code.entropywave.com/projects/orc/
-Source:         http://code.entropywave.com/download/orc/%{name}-%{version}.tar.gz
+Url:            http://cgit.freedesktop.org/gstreamer/orc
+Source:         http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+Patch1:         orc-disable-test-limits.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gtk-doc
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 Provides:       %{name}-devel = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -62,28 +66,29 @@ arithmetic operations.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
+autoreconf -fi
 %configure \
     --disable-static \
     --enable-gtk-doc
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
 # These are some examples that seem not to make sense to be distributed
 rm -rf %{buildroot}%{_libdir}/orc
+
 # Remove libtool archives
-find %{buildroot}%{_libdir} -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-%ifnarch %arm
-make check
+%ifnarch %{arm}
+make check %{?_smp_mflags}
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %post -n liborc-0_4-0 -p /sbin/ldconfig
 
 %postun -n liborc-0_4-0 -p /sbin/ldconfig