diff --git a/html/changelog.html b/html/changelog.html
index 85799205f29..c905bead47c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,34 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">23 May 2018</h2>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed a runtime with the gulag teleporter that could cause the process to fail if you removed the ID.</li>
+				<li class="tweak">Not setting the goal of a prisoner's ID when teleporting them will now set the ID's goal to the default value (200 points at the time of this change.)</li>
+			</ul>
+			<h3 class="author">SpaceManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Flipping and then rotating trinary pipe fittings no longer causes their icon to mismatch what they will become when wrenched.</li>
+				<li class="bugfix">RPD tooltips for flippable trinary components have been corrected.</li>
+				<li class="bugfix">Entertainment monitors now view the real Thunderdome rather than the template.</li>
+			</ul>
+			<h3 class="author">cyclowns updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.</li>
+				<li class="tweak">Analyzers now show temperature in kelvin as well as celsius.</li>
+				<li class="tweak">Analyzers now show total mole count, volume, and mole count of all gases.</li>
+				<li class="tweak">Analyzers show everything at slightly higher degrees of precision.</li>
+			</ul>
+			<h3 class="author">imsxz updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">Using mayhem bottles and going under their effects is now logged.</li>
+			</ul>
+			<h3 class="author">kevinz000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Any anomaly core can now be deconstructed for a one time boost of 10k points in the deconstructive analyzer.</li>
+			</ul>
+
 			<h2 class="date">22 May 2018</h2>
 			<h3 class="author">Cyberboss updated:</h3>
 			<ul class="changes bgimages16">
@@ -1435,22 +1463,6 @@
 				<li class="bugfix">Ventcrawlers in pipes now breathe from that pipe.</li>
 				<li class="bugfix">Deconstructing atmos components no longer breaks ventcrawl visuals.</li>
 			</ul>
-
-			<h2 class="date">21 March 2018</h2>
-			<h3 class="author">BunnyBot5000 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Fringe Weaver drink - made with ethanol and sugar, it's classy (and slightly weaker) hooch</li>
-				<li class="rscadd">Sugar Rush drink - made with sugar, lemon juice, and wine. It's got a slight nutritional value but decreases your satiety, causing you to be unable to consume junk food.</li>
-				<li class="rscadd">Crevice Spike drink - made with lime juice and hot sauce. A 'sobering' drink, the Crevice Spike will reduce your drunkenness slightly but it kicks hard going down, dealing 15 points of brute when first ingested.</li>
-			</ul>
-			<h3 class="author">MrStonedOne updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">VOX sounds are now forcefully preloaded on clients to deal with an issue keeping byond from loading them</li>
-			</ul>
-			<h3 class="author">cyclowns updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 49a2e173039..e9ebed2bc54 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17971,3 +17971,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Chasms no longer drop mobs buckled to undroppable mobs or objects.
   resistor:
   - rscadd: Added circuit labels! You can now customize the description of your assemblies.
+2018-05-23:
+  ShizCalev:
+  - bugfix: Fixed a runtime with the gulag teleporter that could cause the process
+      to fail if you removed the ID.
+  - tweak: Not setting the goal of a prisoner's ID when teleporting them will now
+      set the ID's goal to the default value (200 points at the time of this change.)
+  SpaceManiac:
+  - bugfix: Flipping and then rotating trinary pipe fittings no longer causes their
+      icon to mismatch what they will become when wrenched.
+  - bugfix: RPD tooltips for flippable trinary components have been corrected.
+  - bugfix: Entertainment monitors now view the real Thunderdome rather than the template.
+  cyclowns:
+  - rscadd: Analyzers can now scan all kinds of atmospheric machinery - unary, binary,
+      ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers,
+      vents and so forth can be analyzed.
+  - tweak: Analyzers now show temperature in kelvin as well as celsius.
+  - tweak: Analyzers now show total mole count, volume, and mole count of all gases.
+  - tweak: Analyzers show everything at slightly higher degrees of precision.
+  imsxz:
+  - admin: Using mayhem bottles and going under their effects is now logged.
+  kevinz000:
+  - rscadd: Any anomaly core can now be deconstructed for a one time boost of 10k
+      points in the deconstructive analyzer.
diff --git a/html/changelogs/AutoChangeLog-pr-37631.yml b/html/changelogs/AutoChangeLog-pr-37631.yml
deleted file mode 100644
index 33549e89724..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37631.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "cyclowns"
-delete-after: True
-changes: 
-  - rscadd: "Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed."
-  - tweak: "Analyzers now show temperature in kelvin as well as celsius."
-  - tweak: "Analyzers now show total mole count, volume, and mole count of all gases."
-  - tweak: "Analyzers show everything at slightly higher degrees of precision."
diff --git a/html/changelogs/AutoChangeLog-pr-37912.yml b/html/changelogs/AutoChangeLog-pr-37912.yml
deleted file mode 100644
index 5a51261b02a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37912.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes: 
-  - rscadd: "Any anomaly core can now be deconstructed for a one time boost of 10k points in the deconstructive analyzer."
diff --git a/html/changelogs/AutoChangeLog-pr-37951.yml b/html/changelogs/AutoChangeLog-pr-37951.yml
deleted file mode 100644
index 00d2cd7a2bb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37951.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "imsxz"
-delete-after: True
-changes: 
-  - admin: "Using mayhem bottles and going under their effects is now logged."
diff --git a/html/changelogs/AutoChangeLog-pr-37962.yml b/html/changelogs/AutoChangeLog-pr-37962.yml
deleted file mode 100644
index bcaecfb6879..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37962.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes: 
-  - bugfix: "Fixed a runtime with the gulag teleporter that could cause the process to fail if you removed the ID."
-  - tweak: "Not setting the goal of a prisoner's ID when teleporting them will now set the ID's goal to the default value (200 points at the time of this change.)"
diff --git a/html/changelogs/AutoChangeLog-pr-37982.yml b/html/changelogs/AutoChangeLog-pr-37982.yml
deleted file mode 100644
index 4bfb8e6e0c9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37982.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "Flipping and then rotating trinary pipe fittings no longer causes their icon to mismatch what they will become when wrenched."
-  - bugfix: "RPD tooltips for flippable trinary components have been corrected."
diff --git a/html/changelogs/AutoChangeLog-pr-37984.yml b/html/changelogs/AutoChangeLog-pr-37984.yml
deleted file mode 100644
index 10e0d2ab4ab..00000000000
--- a/html/changelogs/AutoChangeLog-pr-37984.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes: 
-  - bugfix: "Entertainment monitors now view the real Thunderdome rather than the template."