diff --git a/html/changelog.html b/html/changelog.html
index f164041dd8..8a5a9b6746 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">17 May 2016</h2>
+			<h3 class="author">SilveryFerret updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Changes the Death Alarms from announcing over Common channel, to announcing only over Medical and Security channels.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added shotglasses. These can contain 10 units. They have their whole contents swalloed in one gulp. They can be produced in the autolathe or found in the booze vending machine in the bar.</li>
+			</ul>
+
 			<h2 class="date">16 May 2016</h2>
 			<h3 class="author">Yoshax updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d985e94aba..44db272df5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2297,3 +2297,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       actually work.
   - rscadd: Adds several new items to the uplink including tactical knives, metal
       foam grenades, ambrosia seeds and much more.
+2016-05-17:
+  SilveryFerret:
+  - rscadd: Changes the Death Alarms from announcing over Common channel, to announcing
+      only over Medical and Security channels.
+  Yoshax:
+  - rscadd: Added shotglasses. These can contain 10 units. They have their whole contents
+      swalloed in one gulp. They can be produced in the autolathe or found in the
+      booze vending machine in the bar.
diff --git a/html/changelogs/SilveryFerret-PR-1664.yml b/html/changelogs/SilveryFerret-PR-1664.yml
deleted file mode 100644
index 7877b71410..0000000000
--- a/html/changelogs/SilveryFerret-PR-1664.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: SilveryFerret
-
-# 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: 
-  - rscadd: "Changes the Death Alarms from announcing over Common channel, to announcing only over Medical and Security channels."
\ No newline at end of file
diff --git a/html/changelogs/yoshax - shotglasses.yml b/html/changelogs/yoshax - shotglasses.yml
deleted file mode 100644
index 5944d8f5c6..0000000000
--- a/html/changelogs/yoshax - shotglasses.yml	
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: Yoshax
-
-# 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: 
-  - rscadd: "Added shotglasses. These can contain 10 units. They have their whole contents swalloed in one gulp. They can be produced in the autolathe or found in the booze vending machine in the bar."