diff --git a/html/changelog.html b/html/changelog.html
index 248b8cb646f..5199844f21b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -77,6 +77,7 @@
 				<li class="tweak">Uprising (Rev+Traitor) now requires 20 minimum players (7 antagonists) instead of 15.</li>
 				<li class="bugfix">Pressure Regulators in INPUT regulation mode will now be able to transfer gas when the output is a vacuum.</li>
 				<li class="bugfix">Chameleon caps will have an icon again.</li>
+				<li class="bugfix">Being crushed by an airlock while inside something (e.g. a locker) will no longer teleport you outside of the thing.</li>
 			</ul>
 
 			<h2 class="date">18 November 2020</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c0927741dba..c55c5d17b1a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17073,3 +17073,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Pressure Regulators in INPUT regulation mode will now be able to transfer
       gas when the output is a vacuum.
   - bugfix: Chameleon caps will have an icon again.
+  - bugfix: Being crushed by an airlock while inside something (e.g. a locker) will
+      no longer teleport you outside of the thing.
diff --git a/html/changelogs/airlock_crush_movement_fix.yml b/html/changelogs/airlock_crush_movement_fix.yml
deleted file mode 100644
index 473edccec2d..00000000000
--- a/html/changelogs/airlock_crush_movement_fix.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
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: mikomyazaki
-
-# 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: "Being crushed by an airlock while inside something (e.g. a locker) will no longer teleport you outside of the thing."
\ No newline at end of file