diff --git a/html/changelog.html b/html/changelog.html
index e21e5a8b7cf..1ce1f4107f7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,28 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 June 2017</h2>
+			<h3 class="author">Joan updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a new unique Kinetic Accelerator module to necropolis chests.</li>
+				<li class="spellcheck">Renames Clockwork Proselytizers to Replica Fabricators.</li>
+				<li class="balance">Replica Fabricators can directly consume floor tiles, rods, metal, and plasteel for power instead of needing to convert to brass first.</li>
+				<li class="balance">Cogscarabs can no longer use guns.</li>
+			</ul>
+			<h3 class="author">PKPenguin321 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The fake pits that the arcade machines can vend now vend properly, for real this time.</li>
+			</ul>
+			<h3 class="author">Robustin updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The cult master has finally acquired their 3rd spell, Eldritch Pulse. This ability allows the cult master to quickly teleport any cultist or cult structure in visual range to another tile in visual range. This spell has an obvious spell effect that will indicate where the target has gone but without explicitly revealing who the master is. This spell should assist with moving obstinate cultists off an important rune,  getting wandering cultists back onto an important rune, save a cultist from an untimely arrest/summary execution, assist in getting your allies into secure areas, etc.</li>
+				<li class="bugfix">The void torch now only works on items that have been placed on surfaces, this prevents the inventory bugs associated with this item.</li>
+			</ul>
+			<h3 class="author">thefastfoodguy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">you can burn your brains out with a flashlight if you're tired of life</li>
+			</ul>
+
 			<h2 class="date">05 June 2017</h2>
 			<h3 class="author">Expletive updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bf43d190493..091a293167e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11691,3 +11691,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   MMMiracles:
   - tweak: Deepstorage ruin has been redone to be more self-sufficient and up to better
       mapping standards.
+2017-06-06:
+  Joan:
+  - rscadd: Added a new unique Kinetic Accelerator module to necropolis chests.
+  - spellcheck: Renames Clockwork Proselytizers to Replica Fabricators.
+  - balance: Replica Fabricators can directly consume floor tiles, rods, metal, and
+      plasteel for power instead of needing to convert to brass first.
+  - balance: Cogscarabs can no longer use guns.
+  PKPenguin321:
+  - bugfix: The fake pits that the arcade machines can vend now vend properly, for
+      real this time.
+  Robustin:
+  - rscadd: The cult master has finally acquired their 3rd spell, Eldritch Pulse.
+      This ability allows the cult master to quickly teleport any cultist or cult
+      structure in visual range to another tile in visual range. This spell has an
+      obvious spell effect that will indicate where the target has gone but without
+      explicitly revealing who the master is. This spell should assist with moving
+      obstinate cultists off an important rune,  getting wandering cultists back onto
+      an important rune, save a cultist from an untimely arrest/summary execution,
+      assist in getting your allies into secure areas, etc.
+  - bugfix: The void torch now only works on items that have been placed on surfaces,
+      this prevents the inventory bugs associated with this item.
+  thefastfoodguy:
+  - tweak: you can burn your brains out with a flashlight if you're tired of life
diff --git a/html/changelogs/AutoChangeLog-pr-27722.yml b/html/changelogs/AutoChangeLog-pr-27722.yml
deleted file mode 100644
index 860a2149ce4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27722.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Robustin"
-delete-after: True
-changes: 
-  - rscadd: "The cult master has finally acquired their 3rd spell, Eldritch Pulse. This ability allows the cult master to quickly teleport any cultist or cult structure in visual range to another tile in visual range. This spell has an obvious spell effect that will indicate where the target has gone but without explicitly revealing who the master is. This spell should assist with moving obstinate cultists off an important rune,  getting wandering cultists back onto an important rune, save a cultist from an untimely arrest/summary execution, assist in getting your allies into secure areas, etc."
-  - bugfix: "The void torch now only works on items that have been placed on surfaces, this prevents the inventory bugs associated with this item."
diff --git a/html/changelogs/AutoChangeLog-pr-27982.yml b/html/changelogs/AutoChangeLog-pr-27982.yml
deleted file mode 100644
index 49700a092ac..00000000000
--- a/html/changelogs/AutoChangeLog-pr-27982.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - rscadd: "Added a new unique Kinetic Accelerator module to necropolis chests."
diff --git a/html/changelogs/AutoChangeLog-pr-28053.yml b/html/changelogs/AutoChangeLog-pr-28053.yml
deleted file mode 100644
index cfe4e0a7f00..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28053.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "thefastfoodguy"
-delete-after: True
-changes: 
-  - tweak: "you can burn your brains out with a flashlight if you're tired of life"
diff --git a/html/changelogs/AutoChangeLog-pr-28062.yml b/html/changelogs/AutoChangeLog-pr-28062.yml
deleted file mode 100644
index 724362d81f1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28062.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - spellcheck: "Renames Clockwork Proselytizers to Replica Fabricators."
-  - balance: "Replica Fabricators can directly consume floor tiles, rods, metal, and plasteel for power instead of needing to convert to brass first."
diff --git a/html/changelogs/AutoChangeLog-pr-28066.yml b/html/changelogs/AutoChangeLog-pr-28066.yml
deleted file mode 100644
index 60f1cde481a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28066.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes: 
-  - balance: "Cogscarabs can no longer use guns."
diff --git a/html/changelogs/AutoChangeLog-pr-28117.yml b/html/changelogs/AutoChangeLog-pr-28117.yml
deleted file mode 100644
index 609de002ddc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28117.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "PKPenguin321"
-delete-after: True
-changes: 
-  - bugfix: "The fake pits that the arcade machines can vend now vend properly, for real this time."