diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 9566cd6db40..58b838d5550 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -57,6 +57,13 @@
 			return
 		if(!density)
 			return ..()
+		if(istype(AM, /obj/mecha))
+			var/obj/mecha/mecha = AM
+			if (mecha.occupant)
+				var/mob/M = mecha.occupant
+				if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent popup message spam.
+				M.last_bumped = world.time
+				attack_hand(M)
 		return 0
 
 
diff --git a/html/changelog.html b/html/changelog.html
index 8b4178c2ac6..f7cd3187c7c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,14 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
 
+<div class="commit sansserif">
+	<h2 class="date">05.06.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Exosuits now can open firelocks by walking into them.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">6/5/13</h2>
 	<h3 class="author">Meyar updated:</h3>