diff --git a/fsarchiver-0.6.19.tar.gz b/fsarchiver-0.6.19.tar.gz
deleted file mode 100644
index ab828ea..0000000
--- a/fsarchiver-0.6.19.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ba4d3262059a0cb108de564340d947a4d75d34ba3b8e35a767d543afbf24dbb
-size 244972
diff --git a/fsarchiver-0.6.21.tar.gz b/fsarchiver-0.6.21.tar.gz
new file mode 100644
index 0000000..d5b756c
--- /dev/null
+++ b/fsarchiver-0.6.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aed7a7d5c4a9277f84d0d023f0232baef6700b84b079244a53722066150c2ab9
+size 260895
diff --git a/fsarchiver-types.patch b/fsarchiver-types.patch
index 389f7b3..49e2033 100644
--- a/fsarchiver-types.patch
+++ b/fsarchiver-types.patch
@@ -113,19 +113,3 @@ Index: fsarchiver-0.6.17/src/fs_btrfs.h
 +    uint64_t reserved[32];
      u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE];
  } __attribute__ ((__packed__));
- 
-Index: fsarchiver-0.6.17/src/types.h
-===================================================================
---- fsarchiver-0.6.17.orig/src/types.h
-+++ fsarchiver-0.6.17/src/types.h
-@@ -32,10 +32,6 @@ typedef int32_t s32;
- typedef uint64_t u64;
- typedef int64_t s64;
- 
--typedef uint16_t __le16;
--typedef uint32_t __le32;
--typedef uint64_t __le64;
--
- #define le8_to_cpu(v) (v)
- #define cpu_to_le8(v) (v)
- 
diff --git a/fsarchiver.changes b/fsarchiver.changes
index e242e8a..ccc9603 100644
--- a/fsarchiver.changes
+++ b/fsarchiver.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Jan  8 09:22:02 UTC 2016 - lazy.kent@opensuse.org
+
+- Update to 0.6.21.
+  * Removed duplicate types definitions in order to fix compilation
+    errors.
+  * Attempt to unmount a device four times before failing.
+- Changes in 0.6.20.
+  * Detect version of XFS filesystems in order to preserve it when
+    they are restored.
+  * Add support for XFS filesystems features introduced in XFS
+    version 5.
+  * Make sure the UUIDs of XFS filesystems are always preserved.
+- Update fsarchiver-types.patch: partially fixed upstream.
+- Correct source URL.
+- Install more docs.
+
 -------------------------------------------------------------------
 Sun Oct 12 14:48:05 UTC 2014 - crrodriguez@opensuse.org
 
diff --git a/fsarchiver.spec b/fsarchiver.spec
index 0be9d34..c79f181 100644
--- a/fsarchiver.spec
+++ b/fsarchiver.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fsarchiver
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,13 +17,13 @@
 
 
 Name:           fsarchiver
-Version:        0.6.19
+Version:        0.6.21
 Release:        0
 Summary:        Filesystem Archiver
 License:        GPL-2.0
 Group:          Productivity/Archiving/Backup
 Url:            http://www.fsarchiver.org
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/fdupoux/fsarchiver/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        HOWTO
 # PATCH-FIX-UPSTREAM Remove conflicting uses of reserved identifiers
 Patch0:         fsarchiver-types.patch
@@ -64,8 +64,8 @@ make %{?_smp_mflags} V=1
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING HOWTO NEWS README THANKS
+%doc ChangeLog COPYING HOWTO NEWS README THANKS internals/
 %{_sbindir}/%{name}
-%doc %{_mandir}/man?/*
+%{_mandir}/man?/*
 
 %changelog