diff --git a/html/changelog.html b/html/changelog.html
index 8bf8ea2fe0c..ef07640fe14 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">20 October 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Parallax preferences now actually get loaded, because apparently that's important or something.</li>
+				<li class="bugfix">Shuttles should now longer get mysterious square shadows.</li>
+			</ul>
+			<h3 class="author">MoondancerPony updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Memory chips will no longer automatically overwrite themselves to whatever their outputs are connected to, and will now output properly. An engineer seems to have installed the chip backwards inside the casing. NanoTrasen apologises for this lapse in service.</li>
+				<li class="bugfix">Locators and other scanning devices now properly push data to other devices.</li>
+				<li class="bugfix">Basic pathfinders will now stop moving if they cannot see their target, instead of jamming.</li>
+			</ul>
+
 			<h2 class="date">15 October 2017</h2>
 			<h3 class="author">AgentWhatever updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4e7317c0542..b95d798781b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4738,3 +4738,16 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       booze-o-mat)
   - rscadd: Added Champagne to the booze dispenser.
   - rscadd: Added 11 new (moderately thought out) cocktails.
+2017-10-20:
+  Lohikar:
+  - bugfix: Parallax preferences now actually get loaded, because apparently that's
+      important or something.
+  - bugfix: Shuttles should now longer get mysterious square shadows.
+  MoondancerPony:
+  - bugfix: Memory chips will no longer automatically overwrite themselves to whatever
+      their outputs are connected to, and will now output properly. An engineer seems
+      to have installed the chip backwards inside the casing. NanoTrasen apologises
+      for this lapse in service.
+  - bugfix: Locators and other scanning devices now properly push data to other devices.
+  - bugfix: Basic pathfinders will now stop moving if they cannot see their target,
+      instead of jamming.
diff --git a/html/changelogs/lohikar-fixes.yml b/html/changelogs/lohikar-fixes.yml
deleted file mode 100644
index 28ef224e7e0..00000000000
--- a/html/changelogs/lohikar-fixes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Lohikar
-delete-after: True
-changes: 
-  - bugfix: "Parallax preferences now actually get loaded, because apparently that's important or something."
-  - bugfix: "Shuttles should now longer get mysterious square shadows."
diff --git a/html/changelogs/mdp-pushdata.yml b/html/changelogs/mdp-pushdata.yml
deleted file mode 100644
index 6602edd6c43..00000000000
--- a/html/changelogs/mdp-pushdata.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: MoondancerPony
-delete-after: True
-changes: 
-  - bugfix: "Memory chips will no longer automatically overwrite themselves to whatever their outputs are connected to, and will now output properly. An engineer seems to have installed the chip backwards inside the casing. NanoTrasen apologises for this lapse in service."
-  - bugfix: "Locators and other scanning devices now properly push data to other devices."
-  - bugfix: "Basic pathfinders will now stop moving if they cannot see their target, instead of jamming."