diff --git a/html/changelog.html b/html/changelog.html
index fb136761699..6f39d31a48b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,35 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">24 March 2018</h2>
+			<h3 class="author">Davidj361 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ranged guardians in scout mode no longer are able to move out of their master when recalled.</li>
+			</ul>
+			<h3 class="author">Denton updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="spellcheck">Fixed missing capitalization for craft menu items.</li>
+				<li class="bugfix">Air alarms no longer trigger atmospherics alarms when stimulum or hyper-noblium are present. The allowed partial pressure of pluoxium has been increased as well.</li>
+			</ul>
+			<h3 class="author">Robustin updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The Security Techfab can now produce basic shotgun shell types and .38 ammo</li>
+			</ul>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed a large number of missing APCs on Omegastation</li>
+				<li class="bugfix">Fixed unpowered Incinerator outlet injector on Omegastation.</li>
+				<li class="bugfix">Replaced glass window at Omegastation's incinerator with a plasma window.</li>
+				<li class="bugfix">Fixes broken atmos injectors on Omega</li>
+				<li class="bugfix">Fixes broken air outlet on Meta</li>
+				<li class="bugfix">Fixed a couple of malfunctioning atmospheric monitors across the rest of the maps</li>
+				<li class="rscadd">New test atmos monitoring console debug verb to help alleviate future issues.</li>
+			</ul>
+			<h3 class="author">YPOQ updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The imaginary friend trauma now works</li>
+			</ul>
+
 			<h2 class="date">23 March 2018</h2>
 			<h3 class="author">Fel updated:</h3>
 			<ul class="changes bgimages16">
@@ -2163,20 +2192,6 @@
 				<li class="rscadd">Redesigned the syndicate ambush space ruin. It now boasts multiple flyable shuttles and looks a lot prettier.</li>
 				<li class="imageadd">Wirecutter greyscaling is now less ugly</li>
 			</ul>
-
-			<h2 class="date">20 January 2018</h2>
-			<h3 class="author">MrDoomBringer updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">All Cargo Techs now come equipped with a standard supply Export Scanner! Get to selling!</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed a bug where slimes wouldn't eat neutral mobs.</li>
-			</ul>
-			<h3 class="author">uraniummeltdown updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Emagged airlocks can now be deconstructed simply by crowbarring when the panel is open</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 81f01fa2718..965b5b2a744 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -16927,3 +16927,27 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   ninjanomnom:
   - bugfix: You can no longer override shuttle areas with new or expanded areas from
       elsewhere.
+2018-03-24:
+  Davidj361:
+  - bugfix: Ranged guardians in scout mode no longer are able to move out of their
+      master when recalled.
+  Denton:
+  - spellcheck: Fixed missing capitalization for craft menu items.
+  - bugfix: Air alarms no longer trigger atmospherics alarms when stimulum or hyper-noblium
+      are present. The allowed partial pressure of pluoxium has been increased as
+      well.
+  Robustin:
+  - tweak: The Security Techfab can now produce basic shotgun shell types and .38
+      ammo
+  ShizCalev:
+  - bugfix: Fixed a large number of missing APCs on Omegastation
+  - bugfix: Fixed unpowered Incinerator outlet injector on Omegastation.
+  - bugfix: Replaced glass window at Omegastation's incinerator with a plasma window.
+  - bugfix: Fixes broken atmos injectors on Omega
+  - bugfix: Fixes broken air outlet on Meta
+  - bugfix: Fixed a couple of malfunctioning atmospheric monitors across the rest
+      of the maps
+  - rscadd: New test atmos monitoring console debug verb to help alleviate future
+      issues.
+  YPOQ:
+  - bugfix: The imaginary friend trauma now works
diff --git a/html/changelogs/AutoChangeLog-pr-36390.yml b/html/changelogs/AutoChangeLog-pr-36390.yml
deleted file mode 100644
index 998fbdb9b7b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36390.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Robustin"
-delete-after: True
-changes: 
-  - tweak: "The Security Techfab can now produce basic shotgun shell types and .38 ammo"
diff --git a/html/changelogs/AutoChangeLog-pr-36545.yml b/html/changelogs/AutoChangeLog-pr-36545.yml
deleted file mode 100644
index 100850782c7..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36545.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes: 
-  - bugfix: "Fixed a large number of missing APCs on Omegastation"
-  - bugfix: "Fixed unpowered Incinerator outlet injector on Omegastation."
-  - bugfix: "Replaced glass window at Omegastation's incinerator with a plasma window."
-  - bugfix: "Fixes broken atmos injectors on Omega"
-  - bugfix: "Fixes broken air outlet on Meta"
-  - bugfix: "Fixed a couple of malfunctioning atmospheric monitors across the rest of the maps"
-  - rscadd: "New test atmos monitoring console debug verb to help alleviate future issues."
diff --git a/html/changelogs/AutoChangeLog-pr-36623.yml b/html/changelogs/AutoChangeLog-pr-36623.yml
deleted file mode 100644
index c081a542310..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36623.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Denton"
-delete-after: True
-changes: 
-  - spellcheck: "Fixed missing capitalization for craft menu items."
diff --git a/html/changelogs/AutoChangeLog-pr-36629.yml b/html/changelogs/AutoChangeLog-pr-36629.yml
deleted file mode 100644
index 62bc6210a73..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36629.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Denton"
-delete-after: True
-changes: 
-  - bugfix: "Air alarms no longer trigger atmospherics alarms when stimulum or hyper-noblium are present. The allowed partial pressure of pluoxium has been increased as well."
diff --git a/html/changelogs/AutoChangeLog-pr-36643.yml b/html/changelogs/AutoChangeLog-pr-36643.yml
deleted file mode 100644
index 641db4ae28f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36643.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Davidj361"
-delete-after: True
-changes: 
-  - bugfix: "Ranged guardians in scout mode no longer are able to move out of their master when recalled."
diff --git a/html/changelogs/AutoChangeLog-pr-36647.yml b/html/changelogs/AutoChangeLog-pr-36647.yml
deleted file mode 100644
index 56647948cd1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-36647.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "YPOQ"
-delete-after: True
-changes: 
-  - bugfix: "The imaginary friend trauma now works"