diff --git a/html/changelog.html b/html/changelog.html
index 16c5621f1be..59cb79f9431 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-
+  
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-
-  </script>
+	
+  </script>  
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -24,7 +24,7 @@
 	<tr>
 		<td valign='top'>
 			<div align='center'><font size='3'><b>Space Station 13</b></font></div>
-
+			
 			<p><div align='center'><font size='3'><a href="https://aurorastation.org/wiki/index.php?title=Main_Page">Wiki</a> | <a href="https://github.com/Aurorastation/Aurora.3">Source code</a></font></div></p>
             <font size='2'>Code licensed under <a href="http://www.gnu.org/licenses/agpl.html">AGPLv3</a>. Content licensed under <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>.<br><br>
 			</td>
@@ -48,14 +48,24 @@
 </table>
 
 		<!--
-
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
-
+		
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
+		
 		*** DO NOT MODIFY THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-
+		
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 August 2018</h2>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes condiments, including salt and pepper, not being able to be poured.</li>
+				<li class="bugfix">Fixes objects getting stuck in xenobiology disposals.</li>
+				<li class="bugfix">Fixes autoinhalers and autoinjectors refusing to change their icons after use.</li>
+				<li class="bugfix">Fixes Slime Batons not spawning without a power source.</li>
+				<li class="bugfix">Fixes miscalculation in heat reduction for fire extinguishers.</li>
+			</ul>
+
 			<h2 class="date">05 August 2018</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
@@ -5730,7 +5740,7 @@
 			<h2 class="date">09 March 2013</h2>
 			<h3 class="author">Cael Aislinn updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Beekeeping is now possible. Construct an apiary of out wood and embed it into a hydroponics tray, then get a queen bee and bottle of BeezEez from cargo bay.
+				<li class="rscadd">Beekeeping is now possible. Construct an apiary of out wood and embed it into a hydroponics tray, then get a queen bee and bottle of BeezEez from cargo bay. 
 		Hives produce honey and honeycomb, but be wary if the bees start swarming.</li>
 			</ul>
 
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dc8ffab6fea..4b50efc905f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5892,3 +5892,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       'Command Dock Monitoring'.
   ben10083:
   - rscadd: Added a Medical Hud to the Medical Module
+2018-08-06:
+  BurgerBB:
+  - bugfix: Fixes condiments, including salt and pepper, not being able to be poured.
+  - bugfix: Fixes objects getting stuck in xenobiology disposals.
+  - bugfix: Fixes autoinhalers and autoinjectors refusing to change their icons after
+      use.
+  - bugfix: Fixes Slime Batons not spawning without a power source.
+  - bugfix: Fixes miscalculation in heat reduction for fire extinguishers.
diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml
deleted file mode 100644
index e469e03e5aa..00000000000
--- a/html/changelogs/burgerbb-fixes.yml
+++ /dev/null
@@ -1,41 +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: BurgerBB
-
-# 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: "Fixes condiments, including salt and pepper, not being able to be poured."
-  - bugfix: "Fixes objects getting stuck in xenobiology disposals."
-  - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use."
-  - bugfix: "Fixes Slime Batons not spawning without a power source."
-  - bugfix: "Fixes miscalculation in heat reduction for fire extinguishers."