diff --git a/options.xhtml b/options.xhtml
index 65eaadfb0..e6d3b459d 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -69545,6 +69545,33 @@ boolean</p>
 </td></tr>
 </table>
 </dd>
+<dt>
+ <span class="term">
+ <a id="opt-uninstall"></a><a class="term" href="options.xhtml#opt-uninstall"><code class="option">uninstall</code>
+  </a>
+ </span>
+</dt>
+<dd>
+<p>Whether to set up a minimal configuration that will remove all managed
+files and packages.</p><p>Use this with extreme care since running the generated activation script
+will remove all Home Manager state from your user environment. This
+includes removing all your historic Home Manager generations.</p>
+
+<p><span class="emphasis"><em>Type:</em></span>
+boolean</p>
+
+<p><span class="emphasis"><em>Default:</em></span>
+<code class="literal">false</code></p>
+
+<p><span class="emphasis"><em>Declared by:</em></span></p>
+<table border="0" summary="Simple list" class="simplelist">
+<tr><td>
+<code class="filename"><a class="filename"  href="https://github.com/nix-community/home-manager/blob/master/modules/misc/uninstall.nix" target="_top">
+&lt;home-manager/modules/misc/uninstall.nix&gt;
+</a></code>
+</td></tr>
+</table>
+</dd>
 <dt>
  <span class="term">
  <a id="opt-wayland.windowManager.hyprland.enable"></a><a class="term" href="options.xhtml#opt-wayland.windowManager.hyprland.enable"><code class="option">wayland.windowManager.hyprland.enable</code>
diff --git a/release-notes.xhtml b/release-notes.xhtml
index e3c3de6d1..b98e2b2bb 100644
--- a/release-notes.xhtml
+++ b/release-notes.xhtml
@@ -26,8 +26,18 @@
    <hr />
   </div><div class="appendix"> <div class="titlepage">  <div>   <div>    <h1 class="title" >     <a id="ch-release-notes"></a>Appendix D. Release Notes   </h1>  </div> </div></div><div class="toc"> <p><strong>Table of Contents</strong></p> <dl class="toc">  <dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-24.05">Release 24.05</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-23.11">Release 23.11</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-23.05">Release 23.05</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-22.11">Release 22.11</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-22.05">Release 22.05</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-21.11">Release 21.11</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-21.05">Release 21.05</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-20.09">Release 20.09</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-20.03">Release 20.03</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-19.09">Release 19.09</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-19.03">Release 19.03</a> </span></dt><dt> <span class="chapter">  <a href="release-notes.xhtml#sec-release-18.09">Release 18.09</a> </span></dt> </dl></div><p>This section lists the release notes for stable versions of Home Manager
 and the current unstable version.</p><div class="chapter"> <div class="titlepage">  <div>   <div>    <h2 class="title" >     <a id="sec-release-24.05"></a>Release 24.05   </h2>  </div> </div></div><div class="toc"> <p><strong>Table of Contents</strong></p> <dl class="toc">  <dt> <span class="section">  <a href="release-notes.xhtml#sec-release-24.05-highlights">Highlights</a> </span></dt><dt> <span class="section">  <a href="release-notes.xhtml#sec-release-24.05-state-version-changes">State Version Changes</a> </span></dt> </dl></div><p>This is the current unstable branch and the information in this section
-is therefore not final.</p><div class="section"> <div class="titlepage">  <div>   <div>    <h2 class="title" style="clear: both">     <a id="sec-release-24.05-highlights"></a>Highlights   </h2>  </div> </div></div><p>This release has the following notable changes:</p><div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: disc;"><li class="listitem"><p>The <code class="literal">.release</code> file in the Home Manager project root has been
-removed. Please use the <code class="literal">release.json</code> file instead.</p></li></ul></div>
+is therefore not final.</p><div class="section"> <div class="titlepage">  <div>   <div>    <h2 class="title" style="clear: both">     <a id="sec-release-24.05-highlights"></a>Highlights   </h2>  </div> </div></div><p>This release has the following notable changes:</p><div class="itemizedlist"><ul class="itemizedlist " style="list-style-type: disc;"><li class="listitem"><p>The <code class="literal">.release</code> file in the Home Manager project root has been
+removed. Please use the <code class="literal">release.json</code> file instead.</p></li><li class="listitem"><p>The <span class="command"><strong>home-manager uninstall</strong></span> command has been reworked to,
+hopefully, be more robust. The new implementation makes use of a new
+Boolean configuration option <a class="link" href="options.xhtml#opt-uninstall"  >uninstall</a> that can
+also be used in a pure Nix Flake setup.</p><p>Specifically, if you are using a Flake only installation, then you
+can clean up a Home Manager installation by adding</p><pre><code class="programlisting  nix">uninstall = true;
+</code></pre><p>to your existing configuration and then build and activate. This
+will override any other configuration and cause, for example, the
+removal of all managed files.</p><p>Please be very careful when enabling this option since activating
+the built configuration will not only remove the managed files but
+<span class="emphasis"><em>all</em></span> Home Manager state from your user environment. This includes
+removing all your historic Home Manager generations!</p></li></ul></div>
 </div><div class="section"> <div class="titlepage">  <div>   <div>    <h2 class="title" style="clear: both">     <a id="sec-release-24.05-state-version-changes"></a>State Version Changes   </h2>  </div> </div></div><p>The state version in this release includes the changes below. These
 changes are only active if the <code class="literal">home.stateVersion</code> option is set to
 &quot;24.05&quot; or later.</p><div class="itemizedlist"><ul class="itemizedlist compact" style="list-style-type: disc;"><li class="listitem"><p>Nothing, yet.</p></li></ul></div>