diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 8b7ce92fb..0b7ebbbb0 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -783,6 +783,21 @@ SOLDIER_TOOLTIP_DISPLAY_BIG_SLOT_3 = TRUE
 SOLDIER_TOOLTIP_DISPLAY_BIG_SLOT_4 = TRUE
 
 
+;******************************************************************************************************************************
+; This section controls Shift+F behaviour. 
+; Use this combination to to remove attachments and  to unload all weapons in sector 
+;******************************************************************************************************************************
+
+; Set this to false to keep weapons loaded. 
+; Note that loaded weapon can be stolen by militia or enemy.
+SHIFT_F_UNLOAD_WEAPONS     = TRUE
+
+; Set this to false to keep item attachments. 
+; Unseparable attachments will not be removed.
+SHIFT_F_REMOVE_ATTACHMENTS = TRUE
+
+
+
 ;******************************************************************************************************************************
 ; -----------------------------------------------------------------------------------------------------------------------------
 ; In this section you can change sounds settings
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 8a8fc5669..a927049a4 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -777,6 +777,22 @@ SOLDIER_TOOLTIP_DISPLAY_BIG_SLOT_3 = TRUE
 SOLDIER_TOOLTIP_DISPLAY_BIG_SLOT_4 = TRUE
 
 
+;******************************************************************************************************************************
+; This section controls Shift+F behaviour. 
+; Use this combination to to remove attachments and  to unload all weapons in sector 
+;******************************************************************************************************************************
+
+; Set this to false to keep weapons loaded. 
+; Note that loaded weapon can be stolen by militia or enemy.
+SHIFT_F_UNLOAD_WEAPONS     = TRUE
+
+; Set this to false to keep item attachments. 
+; Unseparable attachments will not be removed.
+SHIFT_F_REMOVE_ATTACHMENTS = TRUE
+
+
+
+
 ;******************************************************************************************************************************
 ; -----------------------------------------------------------------------------------------------------------------------------
 ; In this section you can change sounds settings