diff --git a/.flatpak.metadata b/.flatpak.metadata
index bd1dca6..b8f84a2 100644
--- a/.flatpak.metadata
+++ b/.flatpak.metadata
@@ -1,2 +1,2 @@
-de76311784f7561d851c0086699a6fa64563130e SOURCES/flatpak-0.8.7.tar.xz
+a2aaeced6ca28308e3208640f7a33b36d476c6fb SOURCES/flatpak-0.8.8.tar.xz
 e486e7b004dc6eb072bee9ce275504db42ddddd3 SOURCES/libostree-2017.2.tar.xz
diff --git a/.gitignore b/.gitignore
index d10ffe7..0bbff02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/flatpak-0.8.7.tar.xz
+SOURCES/flatpak-0.8.8.tar.xz
 SOURCES/libostree-2017.2.tar.xz
diff --git a/SPECS/flatpak.spec b/SPECS/flatpak.spec
index 692c0a5..40b639b 100644
--- a/SPECS/flatpak.spec
+++ b/SPECS/flatpak.spec
@@ -1,7 +1,7 @@
 %global ostree_version 2017.2
 
 Name:           flatpak
-Version:        0.8.7
+Version:        0.8.8
 Release:        3%{?dist}
 Summary:        Application deployment framework for desktop apps
 
@@ -130,7 +130,8 @@ cd libostree-%{ostree_version}
            --disable-introspection \
            --without-selinux \
            --without-dracut \
-           LIBS=-lgpg-error
+           LIBS=-lgpg-error \
+           CPPFLAGS="$CPPFLAGS -DDISABLE_OTMPFILE"
 %make_build V=1
 cd ..
 
@@ -160,7 +161,6 @@ export PKG_CONFIG_PATH=$ROOT/lib/pkgconfig
  %configure \
             --with-dwarf-header=%{_includedir}/libdwarf --with-priv-mode=none \
             --enable-docbook-docs \
-            --docdir=%{_pkgdocdir} \
             --disable-introspection $CONFIGFLAGS)
 %make_build V=1
 sed -i s/ostree-1// %{name}.pc
@@ -170,7 +170,13 @@ mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/flatpak
 %make_install
 install -d %{buildroot}%{_libdir}/flatpak
 mv root/lib/libostree-1.so* %{buildroot}%{_libdir}/flatpak
-install -pm 644 NEWS README.md %{buildroot}/%{_pkgdocdir}
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1392354
+install -d %{buildroot}/%{_pkgdocdir}
+if test -d %{buildroot}/%{_docdir}/%{name}; then
+    mv %{buildroot}/%{_docdir}/%{name}/* %{buildroot}/%{_pkgdocdir}
+    rmdir %{buildroot}/%{_docdir}/%{name}/
+fi
+install -t %{buildroot}/%{_pkgdocdir} -pm 644 NEWS README.md
 # The system repo is not installed by the flatpak build system.
 install -d %{buildroot}%{_localstatedir}/lib/flatpak
 install -d %{buildroot}%{_sysconfdir}/flatpak/remotes.d
@@ -246,12 +252,19 @@ flatpak remote-list --system &> /dev/null || :
 
 
 %changelog
-* Fri Nov 10 2017 David King <dking@redhat.com> - 0.8.7-3
+* Mon Dec 11 2017 David King <dking@redhat.com> - 0.8.8-3
+- Disable O_TMPFILE in libglnx (#1520311)
+
+* Fri Nov 10 2017 Ray Strode <rstrode@redhat.com> - 0.8.8-2
 - Fix crasher in xdg-desktop-portal
+  Resolves: #1503579
 - Tweak spec file so it still builds even though we need to
   autoreconf.
 
-* Tue Aug 01 2017 Colin Walters <walters@verbum.org> - 0.8.7-2
+* Wed Nov 01 2017 David King <dking@redhat.com> - 0.8.8-1
+- Update to 0.8.8 (#1500800)
+
+* Tue Aug 01 2017 Colin Walters <walters@verbum.org> - 0.8.7-3
 - Fix libostree bundling:
   Ensure we do not Provide or Require libostree.
   Move the shared library into flatpak-libs so flatpak always
@@ -261,6 +274,8 @@ flatpak remote-list --system &> /dev/null || :
   really do much since the dynamic linker and RPM work from the
   soname.
   Resolves: #1476905
+
+* Tue Aug 01 2017 Colin Walters <walters@verbum.org> - 0.8.7-2
 - Tweak build to work both with and without BZ#1392354
 
 * Tue Jun 20 2017 Kalev Lember <klember@redhat.com> - 0.8.7-1