diff --git a/deja-dup-21.2.tar.xz b/deja-dup-21.2.tar.xz
deleted file mode 100644
index cd9d761..0000000
--- a/deja-dup-21.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1385f45bd2680ab7380a7fd2a8a05000049baba00b8e85500b723ad17063c00b
-size 914396
diff --git a/deja-dup-21.4.tar.xz b/deja-dup-21.4.tar.xz
new file mode 100644
index 0000000..43fe638
--- /dev/null
+++ b/deja-dup-21.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b545afc0008a5cdec07f306df774cbae06afb92f37f27e120d33d6f1097ffc5
+size 769992
diff --git a/deja-dup-vala-0.16.patch b/deja-dup-vala-0.16.patch
new file mode 100644
index 0000000..afd1ecf
--- /dev/null
+++ b/deja-dup-vala-0.16.patch
@@ -0,0 +1,19 @@
+Index: deja-dup-21.4/deja-dup/AssistantOperation.vala
+===================================================================
+--- deja-dup-21.4.orig/deja-dup/AssistantOperation.vala
++++ deja-dup-21.4/deja-dup/AssistantOperation.vala
+@@ -193,12 +193,12 @@ public abstract class AssistantOperation
+       Gtk.TextIter start, line100;
+       buffer.get_start_iter(out start);
+       buffer.get_iter_at_line(out line100, buffer.get_line_count() - 100);
+-      buffer.delete(start, line100);
++      buffer.delete(ref start, ref line100);
+     }
+     
+     Gtk.TextIter iter;
+     buffer.get_end_iter(out iter);
+-    buffer.insert_text(iter, log_line, (int)log_line.length);
++    buffer.insert_text(ref iter, log_line, (int)log_line.length);
+     if (adjustment_at_end)
+       adjust.value = adjust.upper;
+   }
diff --git a/deja-dup.changes b/deja-dup.changes
index b233a32..02e1687 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Jan 16 13:34:57 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 21.4:
+  + Polish:
+    - Warn user if we couldn't back up a file because we couldn't
+      read it
+  + Packaging:
+    - Fix -j2 build
+    - Add auto tests that are run during 'make check', suitable for
+      build servers
+  + Updated translations.
+- Re-enable parallel build.
+- Add deja-dup-vala-0.16.patch: fix build with vala 0.15/0.16.
+- Add %check section with new 'make check'.
+- Add dbus-1-x11 BuildRequires, so 'make check' can work:
+  dbus-launch is needed.
+
 -------------------------------------------------------------------
 Tue Nov 22 15:02:09 UTC 2011 - dimstar@opensuse.org
 
diff --git a/deja-dup.spec b/deja-dup.spec
index 9e84a7c..5d0e132 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package deja-dup
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,20 @@
 #
 
 
-
 Name:           deja-dup
-Version:        21.2
-Release:        1
-# FIXME: parallel build fails in 21.1; check if it's fixed in newer versions
+Version:        21.4
+Release:        0
 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang
 # FIXME: check if python-cloudfiles is packaged, and if yes, uncomment Recommends
-License:        GPLv3+
 Summary:        Simple backup tool and frontend for duplicity
-Url:            https://launchpad.net/deja-dup
+License:        GPL-3.0+
 Group:          Productivity/Archiving/Backup
+Url:            https://launchpad.net/deja-dup
 Source0:        %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM deja-dup-vala-0.16.patch lp#91717 vuntz@opensuse.org -- Fix build with vala 0.15/0.16
+Patch0:         deja-dup-vala-0.16.patch
+# For make check to work, we need dbus-launch
+BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
@@ -61,7 +63,6 @@ Features:
  * Integrates well into your GNOME desktop
 
 %package -n nautilus-deja-dup
-License:        GPLv3+
 Summary:        Déjà Dup Plugin for Nautilus
 Group:          Productivity/Archiving/Backup
 Requires:       %{name} = %{version}
@@ -84,11 +85,11 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
-#make %%{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -119,6 +120,9 @@ rm %{name}.man-lang.tmp
 # create hardlinks for the rest
 %fdupes %{buildroot}
 
+%check
+make check
+
 %if 0%{?suse_version} > 1130
 
 %post