diff --git a/html/changelog.html b/html/changelog.html
index d8e74da747d..d8973853357 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 December 2017</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The tranquilizer rifle should work properly now.</li>
+				<li class="bugfix">Fixed some items, such as animals, not appearing when opening a christmas gift.</li>
+			</ul>
+			<h3 class="author">LordFowl updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Mining drones no longer have all access IDs.</li>
+				<li class="rscadd">Mining drones can be upgraded with kinetic accelerators, further cementing the obsolescence of the human shaft miner.</li>
+				<li class="tweak">Mining drones can no longer be upgraded with plasma cutters, and their emag module is no longer a thermal drill.</li>
+			</ul>
+
 			<h2 class="date">12 December 2017</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e702b414557..851996bc64f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4860,3 +4860,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: GODMODE now also protects user from welder damage
   Skull132:
   - bugfix: CCIAA can now see the round type.
+2017-12-22:
+  Alberyk:
+  - bugfix: The tranquilizer rifle should work properly now.
+  - bugfix: Fixed some items, such as animals, not appearing when opening a christmas
+      gift.
+  LordFowl:
+  - bugfix: Mining drones no longer have all access IDs.
+  - rscadd: Mining drones can be upgraded with kinetic accelerators, further cementing
+      the obsolescence of the human shaft miner.
+  - tweak: Mining drones can no longer be upgraded with plasma cutters, and their
+      emag module is no longer a thermal drill.
diff --git a/html/changelogs/alberyk-gunandxmas.yml b/html/changelogs/alberyk-gunandxmas.yml
deleted file mode 100644
index 132d5646561..00000000000
--- a/html/changelogs/alberyk-gunandxmas.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Alberyk
-delete-after: True
-changes: 
-  - bugfix: "The tranquilizer rifle should work properly now."
-  - bugfix: "Fixed some items, such as animals, not appearing when opening a christmas gift."
diff --git a/html/changelogs/minebot.yml b/html/changelogs/minebot.yml
deleted file mode 100644
index 690f9bd260c..00000000000
--- a/html/changelogs/minebot.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#################################
-
-# Your name.  
-author: LordFowl
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Mining drones no longer have all access IDs."
-  - rscadd: "Mining drones can be upgraded with kinetic accelerators, further cementing the obsolescence of the human shaft miner."
-  - tweak: "Mining drones can no longer be upgraded with plasma cutters, and their emag module is no longer a thermal drill."