diff --git a/deja-dup-20.1.tar.bz2 b/deja-dup-20.1.tar.bz2
deleted file mode 100644
index 3fea2d9..0000000
--- a/deja-dup-20.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c47db5e83e7079da7232b05c6109cd13af0cc6c3f956f4e91a473a66288ce75f
-size 1266551
diff --git a/deja-dup-21.1.tar.xz b/deja-dup-21.1.tar.xz
new file mode 100644
index 0000000..cde3d3e
--- /dev/null
+++ b/deja-dup-21.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7db60336b2385d6f3d98190343c8133f4962ac5a3d91e930f1d7771156836eb9
+size 741984
diff --git a/deja-dup.changes b/deja-dup.changes
index fe2686b..39b2c58 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 15 22:39:58 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 21.1:
+  + Polish:
+    - Switch to notebook tabs for preferences instead of side list
+  + Bug Fixes:
+    - Allow passwords that contain only whitespaces (while
+      continuing to strip whitespace from normal passwords)
+  + Packaging:
+    - Use valac 0.14 instead of 0.12
+    - Tarballs now only include the vala code, so you'll need valac
+      to compile
+    - No longer require libdbusmenu-gtk3 for Unity support
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Disable parallel build as it breaks the build with this release.
+
 -------------------------------------------------------------------
 Fri Oct 28 14:12:35 UTC 2011 - badshah400@gmail.com
 
diff --git a/deja-dup.spec b/deja-dup.spec
index f7b8549..8af29d0 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -18,22 +18,25 @@
 
 
 Name:           deja-dup
-Version:        20.1
+Version:        21.1
 Release:        1
+# FIXME: parallel build fails in 21.1; check if it's fixed in newer versions
 # 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
 Group:          Productivity/Archiving/Backup
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  perl-gettext
 BuildRequires:  update-desktop-files
-BuildRequires:  vala >= 0.11.6
+BuildRequires:  vala >= 0.14.0
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libnautilus-extension)
@@ -84,7 +87,8 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 
 %build
 %configure --disable-static
-%__make %{?_smp_mflags}
+#make %%{?_smp_mflags}
+make
 
 %install
 %makeinstall