diff --git a/html/changelog.html b/html/changelog.html
index ca9cb73ae7..731c4fd321 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,31 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">24 June 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed Tajaran name generation producing names without a space between first and last.</li>
+				<li class="wip">Adds docking to the mercenary shuttle. Works similarly to other shuttles, except docking and undocking is manually initiated and not automatic. A system to approve or deny dock requests still to be implemented.</li>
+				<li class="rscadd">Toolboxes can now hold larger items, such as stacks of metal or power cells, at the cost of having less space for other things.</li>
+				<li class="tweak">Gloves/shoes can now be worn even if you have one hand/foot missing. The other one still has to be present, of course. The items still drop when you first lose the hand/foot.</li>
+				<li class="tweak">Budget insulated gloves are somewhat less useless. On average, they will stop half the damage from getting shocked, and the worst case insulation is not as bad as it used to be. Budget gloves that are as good as regular insulated gloves are still as rare as they were before though.</li>
+				<li class="tweak">PTR bullets are now hitscan, to make them somewhat better for actual sniping.</li>
+				<li class="maptweak">The telecoms server room now has an actual cycling airlock into it.</li>
+				<li class="tweak">Non-vital body parts will no longer take further damage above a certain amount, and will inflict paincrit effects instead. On most humaniods the head, chest, and groin are vital.</li>
+				<li class="rscadd">Engineers now spawn with industrial workboots (credit: ChessPiece/Bishop).</li>
+				<li class="bugfix">Damaged robotic legs now more likely to have an effect.</li>
+				<li class="bugfix">Fixed bug preventing internal organs from taking damage in some cases.</li>
+				<li class="maptweak">New flavours of tables around the station. Engineering starts with more plastic.</li>
+				<li class="bugfix">Fixed worn items not appearing in some cases. Most notably crossbows and certain guns when worn on the back. As a side effect, laundry machines no longer transform items.</li>
+				<li class="bugfix">Crit oxyloss now runs in game time instead of real time. So if lag is slowing your movement the same slowdown applies to the dying person you're trying to reach.</li>
+				<li class="rscadd">Breathmasks can now be adjusted by clicking on them in your hand, in addition to the verb.</li>
+				<li class="rscadd">Wearing a space helmet or similar face-covering gear now prevents eating and force-feeding food, drink, and pills.</li>
+				<li class="rscadd">Phoron in air ignites above it's flashpoint temperature and a certain (very small) minimum concentration. Environments that have oxygen and are hot enough, and have phoron but not enough concentration to burn will produce flareouts, which are mostly a visual effect.</li>
+				<li class="rscadd">Adds animation when making unarmed attacks or attacking with melee weapons, to help make it clearer who is attacking.</li>
+				<li class="soundadd">Opening an unpowered door now has an appropriate sound.</li>
+				<li class="rscadd">Ingesting diseased blood may contract the disease.</li>
+			</ul>
+
 			<h2 class="date">19 June 2015</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2661935993..7de13c7f0d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1942,3 +1942,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       to help make it clearer who is attacking.
   - soundadd: Opening an unpowered door now has an appropriate sound.
   - rscadd: Ingesting diseased blood may contract the disease.
+2015-06-26: {}