diff --git a/html/changelog.html b/html/changelog.html
index 9f8d815ae95..43adc4d3b87 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,22 @@
-->
+
12 April 2017
+
Anewbe updated:
+
+ - Material weapons now go dull instead of shattering. Certain weapons, like spears, will still shatter.
+ - Dull weapons do less damage, but can be sharpened with a whetstone.
+ - Whetstones can be crafted using plasteel.
+
+
Belsima updated:
+
+ - Replaces cypherkey sprites with improved ones.
+
+
Sin4 updated:
+
+ - You can no longer ascend a table by walking from a flipped table to a non-flipped one.
+
+
08 April 2017
Anewbe updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2e02a74b2c8..1965caf7b0e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3399,3 +3399,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Sin4:
- bugfix: Fixed back icons for Z8 Carbine, C20r, fireaxe, spear, and baseball bat.
- rscadd: If observing before roundstart, you may respawn.
+2017-04-12:
+ Anewbe:
+ - rscadd: Material weapons now go dull instead of shattering. Certain weapons, like
+ spears, will still shatter.
+ - rscadd: Dull weapons do less damage, but can be sharpened with a whetstone.
+ - rscadd: Whetstones can be crafted using plasteel.
+ Belsima:
+ - tweak: Replaces cypherkey sprites with improved ones.
+ Sin4:
+ - bugfix: You can no longer ascend a table by walking from a flipped table to a
+ non-flipped one.
diff --git a/html/changelogs/Anewbe - Weapons.yml b/html/changelogs/Anewbe - Weapons.yml
deleted file mode 100644
index 353ffdc5054..00000000000
--- a/html/changelogs/Anewbe - Weapons.yml
+++ /dev/null
@@ -1,38 +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: Anewbe
-
-# 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: "Material weapons now go dull instead of shattering. Certain weapons, like spears, will still shatter."
- - rscadd: "Dull weapons do less damage, but can be sharpened with a whetstone."
- - rscadd: "Whetstones can be crafted using plasteel."
\ No newline at end of file
diff --git a/html/changelogs/Belsima - Cypherkeys.yml b/html/changelogs/Belsima - Cypherkeys.yml
deleted file mode 100644
index 877dbc765aa..00000000000
--- a/html/changelogs/Belsima - Cypherkeys.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: Belsima
-
-# 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:
- - tweak: "Replaces cypherkey sprites with improved ones."
diff --git a/html/changelogs/Sin4 - tablefix.yml b/html/changelogs/Sin4 - tablefix.yml
deleted file mode 100644
index 6d8b4480e78..00000000000
--- a/html/changelogs/Sin4 - tablefix.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: Sin4
-
-# 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: "You can no longer ascend a table by walking from a flipped table to a non-flipped one."