diff --git a/.gitignore b/.gitignore
index b258220..c69bd22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,4 @@
 /libostree-2023.3.tar.xz
 /libostree-2023.4.tar.xz
 /libostree-2023.5.tar.xz
+/libostree-2023.6.tar.xz
diff --git a/ostree.spec b/ostree.spec
index 93f83e9..2c63f73 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -7,8 +7,8 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2023.5
-Release: 3%{?dist}
+Version: 2023.6
+Release: 1%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPL-2.0-or-later
 URL: https://ostree.readthedocs.io/en/latest/
@@ -106,6 +106,7 @@ env NOCONFIGURE=1 ./autogen.sh
            --with-curl \
            --with-soup3 \
            --with-openssl \
+           --with-composefs \
            %{?with_tests:--enable-installed-tests=exclusive} \
            --with-dracut=yesbutnoconf
 %make_build
@@ -136,7 +137,6 @@ find %{buildroot} -name '*.la' -delete
 %{_prefix}/lib/systemd/system-generators/ostree-system-generator
 %exclude %{_sysconfdir}/grub.d/*ostree
 %exclude %{_libexecdir}/libostree/grub2*
-%exclude %{_libexecdir}/libostree/ostree-trivial-httpd
 %{_prefix}/lib/tmpfiles.d/*
 %{_prefix}/lib/ostree
 # Moved in git master
@@ -166,10 +166,12 @@ find %{buildroot} -name '*.la' -delete
 %files tests
 %{_libexecdir}/installed-tests
 %{_datadir}/installed-tests
-%{_libexecdir}/libostree/ostree-trivial-httpd
 %endif
 
 %changelog
+* Fri Aug 25 2023 Colin Walters <walters@verbum.org> - 2023.6-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.6
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 3362907..ee64d07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libostree-2023.5.tar.xz) = 0bb19f199344d8db7299cf710f2ba0b2657cdcb5b1fc6d85446cef9538b069e470b47fc0c2c1029e12b8b9adb978f32a6f44f48949ff5c97a01051a425a9f2d5
+SHA512 (libostree-2023.6.tar.xz) = ae803d41ed38ec713959cfa88dab3db94f63c14cc4ad7fc1b0941e3fcfe5128436e25a354c8a291f93ea0c59a3f440b57aecefa109996427463f9165331f78f1