diff --git a/html/changelog.html b/html/changelog.html
index 302264aca16..d89c6dfe4c2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,31 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">11 September 2018</h2>
+			<h3 class="author">Cobby updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">emojis</li>
+			</ul>
+			<h3 class="author">Denton updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the Cere emergency shuttle brig floor.</li>
+				<li class="tweak">Removed access restrictions on the Hi Daniel shuttle's booze-o-mat.</li>
+				<li class="tweak">Added missing surgical drills and cauteries to emergency shuttles.</li>
+				<li class="tweak">Replaced boring high traction floors in the SnapPop!(tm) shuttle with exciting bananium floors.</li>
+			</ul>
+			<h3 class="author">Potato Masher updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">CentCom would like to announce that new station AIs will now support updated surveillance software, allowing units to monitor multiple locations with ease with customizable viewing range, albeit at an overall reduced viewing radius.</li>
+				<li class="config">Cruix's AI Multicamera mode has been finally enabled, with a new config option for enabling and disabling it as well!</li>
+			</ul>
+			<h3 class="author">ninjanomnom updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Radiation toxin damage has been slightly increased.</li>
+				<li class="balance">Contaminated objects are overall a bit weaker but are easier to create in the first place.</li>
+				<li class="balance">Showers deal with high amounts of contamination much faster but aren't that great at dealing with weakly contaminated objects.</li>
+				<li class="rscadd">Atmos holo-barriers have been given radiation insulation like the engineering ones.</li>
+			</ul>
+
 			<h2 class="date">10 September 2018</h2>
 			<h3 class="author">Denton updated:</h3>
 			<ul class="changes bgimages16">
@@ -1449,34 +1474,6 @@
 				<li class="balance">L6 SAW AP ammo now costs 9 TC per magazine, up from 6.</li>
 				<li class="balance">L6 SAW incendiary ammo now deals 20 damage per shot, up from 15.</li>
 			</ul>
-
-			<h2 class="date">10 July 2018</h2>
-			<h3 class="author">Astatineguy12 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">You can now buy energy shields as a nuke op again</li>
-			</ul>
-			<h3 class="author">Denton updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Box/Delta/Pubbystation: Nuclear explosive-shaped beerkegs have been added to maintenance areas.</li>
-			</ul>
-			<h3 class="author">Naksu updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added a new ghost verb that lets you change your ignore settings, allowing previously ignored popups to be un-ignored and notifications without an ignore button to be ignored</li>
-				<li class="bugfix">Chaplains are once again unable to acquire the inquisition ERT commander's sword, as intended. The sword has been restored to its former glory</li>
-			</ul>
-			<h3 class="author">Supermichael777 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Changelings are no longer prevented from entering stasis by another form of fake death.</li>
-			</ul>
-			<h3 class="author">Wjohnston & ninjanomnom updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Engine heaters and engines have had a minor touch up so they don't meld with the floor quite so much.</li>
-				<li class="tweak">Engine heaters don't block air anymore.</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Romerol tumors no longer zombify you if you're alive when the revive timer counts down.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 849263c81a6..823c3246258 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -19996,3 +19996,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - spellcheck: Fixed typos and capitalization in health scanner messages.
   Poojawaw:
   - bugfix: APCs are now able to be rebuilt in Maintenance
+2018-09-11:
+  Cobby:
+  - rscadd: emojis
+  Denton:
+  - bugfix: Fixed the Cere emergency shuttle brig floor.
+  - tweak: Removed access restrictions on the Hi Daniel shuttle's booze-o-mat.
+  - tweak: Added missing surgical drills and cauteries to emergency shuttles.
+  - tweak: Replaced boring high traction floors in the SnapPop!(tm) shuttle with exciting
+      bananium floors.
+  Potato Masher:
+  - tweak: CentCom would like to announce that new station AIs will now support updated
+      surveillance software, allowing units to monitor multiple locations with ease
+      with customizable viewing range, albeit at an overall reduced viewing radius.
+  - config: Cruix's AI Multicamera mode has been finally enabled, with a new config
+      option for enabling and disabling it as well!
+  ninjanomnom:
+  - balance: Radiation toxin damage has been slightly increased.
+  - balance: Contaminated objects are overall a bit weaker but are easier to create
+      in the first place.
+  - balance: Showers deal with high amounts of contamination much faster but aren't
+      that great at dealing with weakly contaminated objects.
+  - rscadd: Atmos holo-barriers have been given radiation insulation like the engineering
+      ones.
diff --git a/html/changelogs/AutoChangeLog-pr-40066.yml b/html/changelogs/AutoChangeLog-pr-40066.yml
deleted file mode 100644
index 4ddbbe14c3c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40066.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "ninjanomnom"
-delete-after: True
-changes: 
-  - balance: "Radiation toxin damage has been slightly increased."
-  - balance: "Contaminated objects are overall a bit weaker but are easier to create in the first place."
-  - balance: "Showers deal with high amounts of contamination much faster but aren't that great at dealing with weakly contaminated objects."
-  - rscadd: "Atmos holo-barriers have been given radiation insulation like the engineering ones."
diff --git a/html/changelogs/AutoChangeLog-pr-40159.yml b/html/changelogs/AutoChangeLog-pr-40159.yml
deleted file mode 100644
index d891f7d5e50..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40159.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Denton"
-delete-after: True
-changes: 
-  - bugfix: "Fixed the Cere emergency shuttle brig floor."
-  - tweak: "Removed access restrictions on the Hi Daniel shuttle's booze-o-mat."
-  - tweak: "Added missing surgical drills and cauteries to emergency shuttles."
-  - tweak: "Replaced boring high traction floors in the SnapPop!(tm) shuttle with exciting bananium floors."
diff --git a/html/changelogs/AutoChangeLog-pr-40161.yml b/html/changelogs/AutoChangeLog-pr-40161.yml
deleted file mode 100644
index b54f21c2385..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40161.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Cobby"
-delete-after: True
-changes: 
-  - rscadd: "emojis"
diff --git a/html/changelogs/AutoChangeLog-pr-40204.yml b/html/changelogs/AutoChangeLog-pr-40204.yml
deleted file mode 100644
index 26b3a3d81ab..00000000000
--- a/html/changelogs/AutoChangeLog-pr-40204.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Potato Masher"
-delete-after: True
-changes: 
-  - tweak: "CentCom would like to announce that new station AIs will now support updated surveillance software, allowing units to monitor multiple locations with ease with customizable viewing range, albeit at an overall reduced viewing radius."
-  - config: "Cruix's AI Multicamera mode has been finally enabled, with a new config option for enabling and disabling it as well!"