diff --git a/html/changelog.html b/html/changelog.html
index a8a7b46171..acc01778ea 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,24 @@
-->
+
07 August 2016
+
HarpyEagle updated:
+
+ - Severe enough burn damage now causes one-time blood loss due to blistering and body fluid cook-off.
+
+
Sin4 updated:
+
+ - Fixed ERT icon not showing up properly for sechuds.
+ - Fixed instances of the game mode's config_tag being displayed instead of the game mode name.
+
+
Yoshax updated:
+
+ - Attacking yourself, or anyone else with a stack of five or more telecrystals will teleport the attacked person to a random, safe (not in space) location within 14 metres.
+ - All telecrystals ammounts have been multiplied by 10. This means the base amount is now 120, and an emag for example costs 30, vs the previous 12 and 3, respectively.
+ - You can once again use telecrystals on an emag to add more uses to it. You get 1 use per every 2 telecrystals.
+ - Instead of only being able to remove 1 telecrystal from your uplink, you can now remove 1, 5, 10, 25, 50.
+
+
05 August 2016
Anewbe updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4bc9e3273b..2b0d3330c5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2648,3 +2648,22 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
come in a box with an explosive, a disguised detonator and a screwdriver. The
use the detonator you muse apply the screwdriver to configure it into detonator
mode. This must be done when it is closed.
+2016-08-07:
+ HarpyEagle:
+ - rscadd: Severe enough burn damage now causes one-time blood loss due to blistering
+ and body fluid cook-off.
+ Sin4:
+ - bugfix: Fixed ERT icon not showing up properly for sechuds.
+ - tweak: Fixed instances of the game mode's config_tag being displayed instead of
+ the game mode name.
+ Yoshax:
+ - rscadd: Attacking yourself, or anyone else with a stack of five or more telecrystals
+ will teleport the attacked person to a random, safe (not in space) location
+ within 14 metres.
+ - tweak: All telecrystals ammounts have been multiplied by 10. This means the base
+ amount is now 120, and an emag for example costs 30, vs the previous 12 and
+ 3, respectively.
+ - tweak: You can once again use telecrystals on an emag to add more uses to it.
+ You get 1 use per every 2 telecrystals.
+ - tweak: Instead of only being able to remove 1 telecrystal from your uplink, you
+ can now remove 1, 5, 10, 25, 50.
diff --git a/html/changelogs/HarpyEagle-burns.yml b/html/changelogs/HarpyEagle-burns.yml
deleted file mode 100644
index f7fce8e5fe..0000000000
--- a/html/changelogs/HarpyEagle-burns.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: HarpyEagle
-
-# 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: "Severe enough burn damage now causes one-time blood loss due to blistering and body fluid cook-off."
\ No newline at end of file
diff --git a/html/changelogs/Sin4 - miscfixes.yml b/html/changelogs/Sin4 - miscfixes.yml
deleted file mode 100644
index ae61151c33..0000000000
--- a/html/changelogs/Sin4 - miscfixes.yml
+++ /dev/null
@@ -1,37 +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: "Fixed ERT icon not showing up properly for sechuds."
- - tweak: "Fixed instances of the game mode's config_tag being displayed instead of the game mode name."
diff --git a/html/changelogs/Yoshax - Telecrystals.yml b/html/changelogs/Yoshax - Telecrystals.yml
deleted file mode 100644
index 25e6a39086..0000000000
--- a/html/changelogs/Yoshax - Telecrystals.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
-#################################
-
-# 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: "Attacking yourself, or anyone else with a stack of five or more telecrystals will teleport the attacked person to a random, safe (not in space) location within 14 metres."
- - tweak: "All telecrystals ammounts have been multiplied by 10. This means the base amount is now 120, and an emag for example costs 30, vs the previous 12 and 3, respectively."
- - tweak: "You can once again use telecrystals on an emag to add more uses to it. You get 1 use per every 2 telecrystals."
- - tweak: "Instead of only being able to remove 1 telecrystal from your uplink, you can now remove 1, 5, 10, 25, 50."