diff --git a/html/changelog.html b/html/changelog.html
index a85dd6ec606..aa0e0eb85d1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,22 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">04 May 2016</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Cultists no longer communicate via tomes.</li>
+				<li class="rscadd">Cultists now communicate via the 'Communion' action button.</li>
+			</ul>
+			<h3 class="author">TechnoAlchemist updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now craft cloaks from the scales of fallen ash drakes, look for the recipe in tablecrafting!</li>
+			</ul>
+			<h3 class="author">coiax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The Service and the Standard cyborg module now have a spraycan built in, for hijinks and passing on important urban messages. The Service cyborg module also has a cyborg-hand labeler, in case anything needs to be labelled.</li>
+				<li class="rscadd">Centcom Suicide Prevention wishes to remind the station: Please do not kill yourself with a hand labeler.</li>
+			</ul>
+
 			<h2 class="date">03 May 2016</h2>
 			<h3 class="author">coiax, Robustin updated:</h3>
 			<ul class="changes bgimages16">
@@ -588,28 +604,6 @@
 				<li class="rscadd">Due to budget cuts, Nanotrasen is no longer utilizing copy-protected paper for its classified documents. Fortunately, our world-class security team has always prevented any thefts or photocopies from being made!</li>
 				<li class="rscadd">Secret documents can be photocopied. If you have an objective to steal any set of documents, a photocopy will be accepted. If you must steal red or blue documents, a photocopy will NOT be accepted. Enterprising traitors can forge the red/blue seal with a crayon to take advantage of this.</li>
 			</ul>
-
-			<h2 class="date">06 April 2016</h2>
-			<h3 class="author">CoreOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now put slimes in stasis by exposing them to room temp CO2. Useful for both fighting the slimes and safely storing them.</li>
-			</ul>
-			<h3 class="author">Erwgd updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The autolathe can now make hydroponics tools! Access the design routines in the Misc. category of the machine.</li>
-			</ul>
-			<h3 class="author">LanCartwright updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Custom viruses with stealth values of 3 or above are now invisible on the PANDEMIC and no longer visible on health huds.</li>
-			</ul>
-			<h3 class="author">MrStonedOne updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Centcom is happy to report that our single sided windows and our windoors should once again create an airtight seal.</li>
-			</ul>
-			<h3 class="author">bgobandit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Honk! Nanotrasen's clowning and development department has invented the clown megaphone, standard in all clowning loadouts! Honk honk!</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0b277f00f04..96a3d3d7bf0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4859,3 +4859,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Changeling Fleshmend is much less effective when used repeatedly in a short
       time. Changeling Panacea is much more effective at purging reagents, reducing
       radiation and now reduces braindamage.
+2016-05-04:
+  Joan:
+  - rscdel: Cultists no longer communicate via tomes.
+  - rscadd: Cultists now communicate via the 'Communion' action button.
+  TechnoAlchemist:
+  - rscadd: You can now craft cloaks from the scales of fallen ash drakes, look for
+      the recipe in tablecrafting!
+  coiax:
+  - rscadd: The Service and the Standard cyborg module now have a spraycan built in,
+      for hijinks and passing on important urban messages. The Service cyborg module
+      also has a cyborg-hand labeler, in case anything needs to be labelled.
+  - rscadd: 'Centcom Suicide Prevention wishes to remind the station: Please do not
+      kill yourself with a hand labeler.'
diff --git a/html/changelogs/AutoChangeLog-pr-17282.yml b/html/changelogs/AutoChangeLog-pr-17282.yml
deleted file mode 100644
index cf1340e9c7c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17282.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: coiax
-delete-after: True
-changes: 
-  - rscadd: "The Service and the Standard cyborg module now have a spraycan built in, for
-hijinks and passing on important urban messages. The Service cyborg module also has a cyborg-hand labeler, in case anything needs to be labelled."
-  - rscadd: "Centcom Suicide Prevention wishes to remind the station: Please do not kill yourself with a hand labeler."
diff --git a/html/changelogs/AutoChangeLog-pr-17322.yml b/html/changelogs/AutoChangeLog-pr-17322.yml
deleted file mode 100644
index a4871cfe933..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17322.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: TechnoAlchemist
-delete-after: True
-changes: 
-  - rscadd: "You can now craft cloaks from the scales of fallen ash drakes, look for the recipe in tablecrafting!"
diff --git a/html/changelogs/AutoChangeLog-pr-17337.yml b/html/changelogs/AutoChangeLog-pr-17337.yml
deleted file mode 100644
index 780769f1159..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17337.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Joan
-delete-after: True
-changes: 
-  - rscdel: "Cultists no longer communicate via tomes."
-  - rscadd: "Cultists now communicate via the 'Communion' action button."