diff --git a/macros.shared-mime-info b/macros.shared-mime-info
index 469353a..3766641 100644
--- a/macros.shared-mime-info
+++ b/macros.shared-mime-info
@@ -17,6 +17,7 @@
 
 # On install, update the mime database
 %mime_database_post()                                          \
+export PKGSYSTEM_ENABLE_FSYNC=0                                \
 if test -x %{_bindir}/update-mime-database; then               \
 %if "x%1" != "x%%1"                                            \
   %{_bindir}/update-mime-database "%1" || true                 \
@@ -28,6 +29,7 @@ fi
 # On uninstall, update the mime database. Note: we ignore upgrades (already
 # handled in %post of the new package).
 %mime_database_postun()                                        \
+export PKGSYSTEM_ENABLE_FSYNC=0                                \
 if [ $1 -eq 0 ]; then                                          \
   if test -x %{_bindir}/update-mime-database; then             \
 %if "x%1" != "x%%1"                                            \
diff --git a/shared-mime-info-1.5.tar.xz b/shared-mime-info-1.5.tar.xz
deleted file mode 100644
index 0e3f708..0000000
--- a/shared-mime-info-1.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180
-size 559040
diff --git a/shared-mime-info-1.6.tar.xz b/shared-mime-info-1.6.tar.xz
new file mode 100644
index 0000000..3c43750
--- /dev/null
+++ b/shared-mime-info-1.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c
+size 557240
diff --git a/shared-mime-info.changes b/shared-mime-info.changes
index 2ff67b9..ccc313e 100644
--- a/shared-mime-info.changes
+++ b/shared-mime-info.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Mar  1 23:19:28 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 1.6:
+  + Add XAR archive mime-type.
+  + Add GeoJSON mime-type.
+  + Add GPX mime-type.
+  + Add xdg-app mime-type.
+  + Add *.xht glob and magic for XHTML files.
+  + Bump priority of archive mime-types with long magics, to avoid
+    false positives when detecting files inside the archive itself.
+- Drop xz BuildRequires: this is already part of default build
+  setups for a long time.
+- Drop workaround for fdo#70366 (that is, no longer
+  export ac_cv_func_fdatasync=no).
+- Add PKGSYSTEM_ENABLE_FSYNC=0 to mime_database_post and
+  mime_database_postun macros, which is the upstream provided way
+  to opt-out of the fdatasync call. That variable is checked for
+  since version 1.4.
+- Add PKGSYSTEM_ENABLE_FSYNC=0 to post script (as we do can't use
+  the macros we install with the package there).
+
 -------------------------------------------------------------------
 Wed Sep 16 20:38:43 UTC 2015 - zaitor@opensuse.org
 
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 61d05d8..dd0d981 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package shared-mime-info
 #
-# Copyright (c) 2015 SUSE LINUX 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,9 +17,8 @@
 
 
 Name:           shared-mime-info
-Version:        1.5
+Version:        1.6
 Release:        0
-# FIXME: Remove workaround for fdo#70366 once fixed
 Url:            http://freedesktop.org/wiki/Software/shared-mime-info
 Summary:        Shared MIME Database
 License:        GPL-2.0+
@@ -33,8 +32,6 @@ BuildRequires:  libxml2-devel
 # needed for xmllint
 BuildRequires:  libxml2-tools
 BuildRequires:  translation-update-upstream
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 # needed by mime-info-to-mime:
 Requires:       /bin/mkdir
 Requires:       /bin/rm
@@ -62,8 +59,6 @@ This package contains:
 translation-update-upstream
 
 %build
-# Workaround for fdo#70366
-export ac_cv_func_fdatasync=no
 %configure \
     --disable-default-make-check
 make
@@ -82,6 +77,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 
 %post
+export PKGSYSTEM_ENABLE_FSYNC=0
 %{_bindir}/update-mime-database %{_datadir}/mime || true
 
 %files