diff --git a/html/changelog.html b/html/changelog.html
index 8c6f36c69fa..e0b056175d7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,8 @@
 				<li class="tweak">The charge cost for robots using the RFD-M has been lowered to 200, down from 500.</li>
 				<li class="rscdel">Mining drones no longer appear as a unique role on the round join menu.</li>
 				<li class="tweak">Mining drone lights are now much brighter, and illuminate in a circle around the drone.</li>
+				<li class="bugfix">Flamethrowers can no longer fire with empty fuel tanks.</li>
+				<li class="bugfix">Flamethrowers now work with any flammable gas.</li>
 			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 53b6544839b..31b53175756 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17434,5 +17434,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscdel: Mining drones no longer appear as a unique role on the round join menu.
   - tweak: Mining drone lights are now much brighter, and illuminate in a circle around
       the drone.
+  - bugfix: Flamethrowers can no longer fire with empty fuel tanks.
+  - bugfix: Flamethrowers now work with any flammable gas.
   Wowzewow (Wezzy):
   - bugfix: Fixes beds spawning with the wrong materials.
diff --git a/html/changelogs/geeves-flamer_fix.yml b/html/changelogs/geeves-flamer_fix.yml
deleted file mode 100644
index 9ee0871e638..00000000000
--- a/html/changelogs/geeves-flamer_fix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - bugfix: "Flamethrowers can no longer fire with empty fuel tanks."
-  - bugfix: "Flamethrowers now work with any flammable gas."