diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index ff332ff14..3bb799e22 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1301,6 +1301,8 @@ SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS 	= TRUE
 SOLDIER_TOOLTIP_DISPLAY_HEALTH 		= TRUE
 SOLDIER_TOOLTIP_DISPLAY_ENERGY    = FALSE
 SOLDIER_TOOLTIP_DISPLAY_MORALE    = TRUE
+SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION 	= TRUE
+SOLDIER_TOOLTIP_DISPLAY_SHOCK		= TRUE
 SOLDIER_TOOLTIP_DISPLAY_TRAITS 		= TRUE
 ; Armor, Headgear
 SOLDIER_TOOLTIP_DISPLAY_HELMET 		= TRUE
@@ -2756,8 +2758,12 @@ MORALE_MOD_BACKGROUND_XENOPHOBIC  = 5
 ; If set to TRUE, you can browse to the briefing room website on the laptop
 BRIEFING_ROOM = FALSE
 
-; Currently not used! If set to TRUE, you can browse to the encyclopedia website on the laptop
-ENCYCLOPEDIA = FALSE
+; If set to TRUE, you can browse to the encyclopedia website on the laptop
+ENCYCLOPEDIA = TRUE
+
+; Determines when to show items in Encyclopedia. 4: Spotted item in merc inventory. 3: Spotted in dealers inventory (or 4),
+; 2: Spotted at Bobby Rays or at AIM/M.E.R.C. website (or 3 or 4). 1: Spotted item on enemy (or 2 to 4). Values from 1 to 4.
+ENCYCLOPEDIA_ITEM_MASK = 1
 
 ; If disabled, the transition will be skipped when opening/closing the laptop
 DISABLE_LAPTOP_TRANSITION = TRUE
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 5cbfc285c..e30a90414 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -7298,6 +7298,7 @@
 		<szBRName>Duckbill</szBRName>
 		<szBRDesc>Attach this metal object to the end of a shotgun barrel for a real deadly effect. It causes buckshot fired from the shotgun to spread out along a horizontal line instead of its standard circular pattern. Say good-bye to  anyone who gets into its path.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
+		<AttachmentClass>2</AttachmentClass>
 		<nasAttachmentClass>2</nasAttachmentClass>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>90</ubGraphicNum>
@@ -40948,6 +40949,7 @@
 		<szBRName>Imp. Mod. Shotgun Choke</szBRName>
 		<szBRDesc>When attached to the end of a shotgun barrel, causes shot fired from the shotgun to group tighter, permiting longer range and more shot to hit the target.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
+		<AttachmentClass>2</AttachmentClass>
 		<nasAttachmentClass>2</nasAttachmentClass>
 		<ubGraphicNum>365</ubGraphicNum>
 		<ubWeight>2</ubWeight>
@@ -40977,6 +40979,7 @@
 		<szBRName>Full Shotgun Choke</szBRName>
 		<szBRDesc>When attached to the end of a shotgun barrel, causes shot fired from the shotgun to group much tighter, permiting longer range and more shot to hit the target.  Not for use with slugs!</szBRDesc>
 		<usItemClass>268435456</usItemClass>
+		<AttachmentClass>2</AttachmentClass>
 		<nasAttachmentClass>2</nasAttachmentClass>
 		<ubGraphicNum>365</ubGraphicNum>
 		<ubWeight>2</ubWeight>
@@ -41006,6 +41009,7 @@
 		<szBRName>Rifled Shotgun Choke</szBRName>
 		<szBRDesc>Makes your slugs to fire long and straight, but throws shot all over tarnation!</szBRDesc>
 		<usItemClass>268435456</usItemClass>
+		<AttachmentClass>2</AttachmentClass>
 		<nasAttachmentClass>2</nasAttachmentClass>
 		<ubGraphicNum>365</ubGraphicNum>
 		<ubWeight>2</ubWeight>
diff --git a/gamedir/Data/Encyclopedia/BUTTONF.sti b/gamedir/Data/Encyclopedia/BUTTONF.sti
index 5a2eb5462..172bf82d1 100644
Binary files a/gamedir/Data/Encyclopedia/BUTTONF.sti and b/gamedir/Data/Encyclopedia/BUTTONF.sti differ
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 9ea0bff0a..289147907 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -1300,6 +1300,8 @@ SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS 	= FALSE
 SOLDIER_TOOLTIP_DISPLAY_HEALTH 		= FALSE
 SOLDIER_TOOLTIP_DISPLAY_ENERGY    = FALSE
 SOLDIER_TOOLTIP_DISPLAY_MORALE    = TRUE
+SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION 	= FALSE
+SOLDIER_TOOLTIP_DISPLAY_SHOCK		= FALSE
 SOLDIER_TOOLTIP_DISPLAY_TRAITS 		= FALSE
 ; Armor, Headgear
 SOLDIER_TOOLTIP_DISPLAY_HELMET 		= FALSE
@@ -2755,9 +2757,13 @@ MORALE_MOD_BACKGROUND_XENOPHOBIC  = 5
 ; If set to TRUE, you can browse to the briefing room website on the laptop
 BRIEFING_ROOM = FALSE
 
-; Currently not used! If set to TRUE, you can browse to the encyclopedia website on the laptop
+; If set to TRUE, you can browse to the encyclopedia website on the laptop
 ENCYCLOPEDIA = FALSE
 
+; Determines when to show items in Encyclopedia. 4: Spotted item in merc inventory. 3: Spotted in dealers inventory (or 4),
+; 2: Spotted at Bobby Rays or at AIM/M.E.R.C. website (or 3 or 4). 1: Spotted item on enemy (or 2 to 4). Values from 1 to 4.
+ENCYCLOPEDIA_ITEM_MASK = 1
+
 ; If disabled, the transition will be skipped when opening/closing the laptop
 DISABLE_LAPTOP_TRANSITION = FALSE