diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md
index ea2171849..a8faf8574 100644
--- a/docs/release-notes/version-2.7.md
+++ b/docs/release-notes/version-2.7.md
@@ -6,6 +6,7 @@
 
 * [#3949](https://github.com/netbox-community/netbox/issues/3949) - Revised the installation docs and upgrade script to employ a Python virtual environment
 * [#4281](https://github.com/netbox-community/netbox/issues/4281) - Allow filtering device component list views by type
+* [#4284](https://github.com/netbox-community/netbox/issues/4284) - Add MRJ21 port and cable types
 * [#4305](https://github.com/netbox-community/netbox/issues/4305) - Add 10-inch option for rack width
 
 ## Bug Fixes
diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index b6b73b7fc..79f00bce4 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -838,6 +838,7 @@ class PortTypeChoices(ChoiceSet):
     TYPE_8P8C = '8p8c'
     TYPE_110_PUNCH = '110-punch'
     TYPE_BNC = 'bnc'
+    TYPE_MRJ21 = 'mrj21'
     TYPE_ST = 'st'
     TYPE_SC = 'sc'
     TYPE_SC_APC = 'sc-apc'
@@ -856,6 +857,7 @@ class PortTypeChoices(ChoiceSet):
                 (TYPE_8P8C, '8P8C'),
                 (TYPE_110_PUNCH, '110 Punch'),
                 (TYPE_BNC, 'BNC'),
+                (TYPE_MRJ21, 'MRJ21'),
             ),
         ),
         (
@@ -906,6 +908,7 @@ class CableTypeChoices(ChoiceSet):
     TYPE_CAT7 = 'cat7'
     TYPE_DAC_ACTIVE = 'dac-active'
     TYPE_DAC_PASSIVE = 'dac-passive'
+    TYPE_MRJ21_TRUNK = 'mrj21-trunk'
     TYPE_COAXIAL = 'coaxial'
     TYPE_MMF = 'mmf'
     TYPE_MMF_OM1 = 'mmf-om1'
@@ -929,6 +932,7 @@ class CableTypeChoices(ChoiceSet):
                 (TYPE_CAT7, 'CAT7'),
                 (TYPE_DAC_ACTIVE, 'Direct Attach Copper (Active)'),
                 (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'),
+                (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'),
                 (TYPE_COAXIAL, 'Coaxial'),
             ),
         ),