diff --git a/html/changelog.html b/html/changelog.html
index d1ea0698c7..c96069abdc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 April 2021</h2>
+			<h3 class="author">ArcaneMusic updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Prevents people from lagging the server by growing HUMANS FROM CABBAGE!</li>
+			</ul>
+			<h3 class="author">BlueWildrose updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">Admins get to hear the prayer ding again unless they have prayer sounds turned off.</li>
+			</ul>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The wood plank cargo pack no longer is named incorrectly.</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">forced climax doesn't do a climax-with</li>
+			</ul>
+			<h3 class="author">SandPoot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Reverts locker/crate behavior for attacking it with an item while closed (use any intent other than help to bash it).</li>
+				<li class="bugfix">Laptop interactions are no longer weird and now you can drag it to yourself to pick it up. tweak: Ctrl+Shift-Click to toggle laptops open/closed. tweak: More examine info for laptops.</li>
+				<li class="bugfix">Lockers/Crates can now be deconstructed the right way respecting the cutting_tool (even if it's not one of the default interactions).</li>
+				<li class="rscdel">Dragging the laptop into itself shouldn't do anything anymore (kind of pointless and hard to do).</li>
+			</ul>
+
 			<h2 class="date">04 April 2021</h2>
 			<h3 class="author">Hatterhat updated:</h3>
 			<ul class="changes bgimages16">
@@ -893,13 +918,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">The green energy sabre's sprite now respects proper handedness.</li>
 			</ul>
-
-			<h2 class="date">02 February 2021</h2>
-			<h3 class="author">silicons updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">pais can now be carried around piggybacking/fireman</li>
-				<li class="balance">Meth and Nuka Cola once again, speed you up.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8e49da45d1..edf98c0152 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28954,3 +28954,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Hatterhat:
   - balance: After a sudden crash in the tower-cap log slash wooden plank economy,
       NanoTrasen has decided to stop selling tower-cap logs to Cargo.
+2021-04-06:
+  ArcaneMusic:
+  - bugfix: Prevents people from lagging the server by growing HUMANS FROM CABBAGE!
+  BlueWildrose:
+  - admin: Admins get to hear the prayer ding again unless they have prayer sounds
+      turned off.
+  DeltaFire15:
+  - bugfix: The wood plank cargo pack no longer is named incorrectly.
+  Putnam3145:
+  - bugfix: forced climax doesn't do a climax-with
+  SandPoot:
+  - bugfix: Reverts locker/crate behavior for attacking it with an item while closed
+      (use any intent other than help to bash it).
+  - bugfix: 'Laptop interactions are no longer weird and now you can drag it to yourself
+      to pick it up. tweak: Ctrl+Shift-Click to toggle laptops open/closed. tweak:
+      More examine info for laptops.'
+  - bugfix: Lockers/Crates can now be deconstructed the right way respecting the cutting_tool
+      (even if it's not one of the default interactions).
+  - rscdel: Dragging the laptop into itself shouldn't do anything anymore (kind of
+      pointless and hard to do).
diff --git a/html/changelogs/AutoChangeLog-pr-14547.yml b/html/changelogs/AutoChangeLog-pr-14547.yml
deleted file mode 100644
index 540fae7d3a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14547.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes: 
-  - bugfix: "Reverts locker/crate behavior for attacking it with an item while closed (use any intent other than help to bash it)."
-  - bugfix: "Laptop interactions are no longer weird and now you can drag it to yourself to pick it up.
-tweak: Ctrl+Shift-Click to toggle laptops open/closed.
-tweak: More examine info for laptops."
-  - bugfix: "Lockers/Crates can now be deconstructed the right way respecting the cutting_tool (even if it's not one of the default interactions)."
-  - rscdel: "Dragging the laptop into itself shouldn't do anything anymore (kind of pointless and hard to do)."
diff --git a/html/changelogs/AutoChangeLog-pr-14559.yml b/html/changelogs/AutoChangeLog-pr-14559.yml
deleted file mode 100644
index c959b92b0f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14559.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes: 
-  - admin: "Admins get to hear the prayer ding again unless they have prayer sounds turned off."
diff --git a/html/changelogs/AutoChangeLog-pr-14565.yml b/html/changelogs/AutoChangeLog-pr-14565.yml
deleted file mode 100644
index 86831e990c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14565.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "The wood plank cargo pack no longer is named incorrectly."
diff --git a/html/changelogs/AutoChangeLog-pr-14566.yml b/html/changelogs/AutoChangeLog-pr-14566.yml
deleted file mode 100644
index ff9a953f55..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14566.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ArcaneMusic"
-delete-after: True
-changes: 
-  - bugfix: "Prevents people from lagging the server by growing HUMANS FROM CABBAGE!"
diff --git a/html/changelogs/AutoChangeLog-pr-14567.yml b/html/changelogs/AutoChangeLog-pr-14567.yml
deleted file mode 100644
index 9862992cb0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14567.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes: 
-  - bugfix: "forced climax doesn't do a climax-with"