diff --git a/html/changelog.html b/html/changelog.html
index c9ef397204c..8edde3953eb 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">12 August 2015</h2>
+			<h3 class="author">CosmicScientist updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Space Carp costume to the code, get it from an autodrobe near you.</li>
+				<li class="rscadd">Added Ian costume to the code, take his place under the HoP's hand, get it from an autodrobe or corgi hide, keep it away from washing machines or it'll meat its end as clothing.</li>
+				<li class="rscadd">Added Space Carp spacesuit to the code, I know what I'm praying for.</li>
+			</ul>
+			<h3 class="author">bgobandit updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">After multiple complaints from WaffleCo food activists, Nanotrasen has added real chocolate, berry juice and blue flavouring to its ice cream products.</li>
+			</ul>
+
 			<h2 class="date">09 August 2015</h2>
 			<h3 class="author">RemieRichards updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6cde492ebc3..947b36ae466 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1530,3 +1530,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       crew!'
   - rscadd: 'Kill Crewmembers: Do you suspect changelings? or dont feel you have enough
       food rations? Just shoot somebody in the head, at any time!'
+2015-08-12:
+  CosmicScientist:
+  - rscadd: Added Space Carp costume to the code, get it from an autodrobe near you.
+  - rscadd: Added Ian costume to the code, take his place under the HoP's hand, get
+      it from an autodrobe or corgi hide, keep it away from washing machines or it'll
+      meat its end as clothing.
+  - rscadd: Added Space Carp spacesuit to the code, I know what I'm praying for.
+  bgobandit:
+  - rscadd: After multiple complaints from WaffleCo food activists, Nanotrasen has
+      added real chocolate, berry juice and blue flavouring to its ice cream products.
diff --git a/html/changelogs/CosmicScientist-AddsCarpAndIanCostumes.yml b/html/changelogs/CosmicScientist-AddsCarpAndIanCostumes.yml
deleted file mode 100644
index 8b48f051ce6..00000000000
--- a/html/changelogs/CosmicScientist-AddsCarpAndIanCostumes.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
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: CosmicScientist
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added Space Carp costume to the code, get it from an autodrobe near you."
-  - rscadd: "Added Ian costume to the code, take his place under the HoP's hand, get it from an autodrobe or corgi hide, keep it away from washing machines or it'll meat its end as clothing."
-  - rscadd: "Added Space Carp spacesuit to the code, I know what I'm praying for."
diff --git a/html/changelogs/bgobandit - weallscreamforreagents.yml b/html/changelogs/bgobandit - weallscreamforreagents.yml
deleted file mode 100644
index 11dcf2502b5..00000000000
--- a/html/changelogs/bgobandit - weallscreamforreagents.yml	
+++ /dev/null
@@ -1,5 +0,0 @@
-
-author: bgobandit
-delete-after: True
-changes: 
-  - rscadd: "After multiple complaints from WaffleCo food activists, Nanotrasen has added real chocolate, berry juice and blue flavouring to its ice cream products."
\ No newline at end of file