diff --git a/data/deprecated.json b/data/deprecated.json
index 44c5fa780..25e273425 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -633,6 +633,10 @@
       "old": {"shop": "antique"},
       "replace": {"shop": "antiques"}
     },
+    {
+      "old": {"shop": "army_surplus"},
+      "replace": {"shop": "military_surplus"}
+    },
     {
       "old": {"shop": "auto_parts"},
       "replace": {"shop": "car_parts"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 61e3b7ca5..5eb20a6b5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7030,6 +7030,11 @@ en:
         # shop=medical_supply
         name: Medical Supply Store
         terms: '<translate with synonyms or related terms for ''Medical Supply Store'', separated by commas>'
+      shop/military_surplus:
+        # shop=military_surplus
+        name: Military Surplus Store
+        # 'terms: armor,army-navy store,army surplus,navy surplus,tactical gear,war surplus shop,weapons'
+        terms: '<translate with synonyms or related terms for ''Military Surplus Store'', separated by commas>'
       shop/mobile_phone:
         # shop=mobile_phone
         name: Mobile Phone Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 20739ae35..ab1aac365 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1046,6 +1046,7 @@
     "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"},
     "shop/massage": {"icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"},
     "shop/medical_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
+    "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"},
     "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
     "shop/money_lender": {"icon": "maki-bank", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
     "shop/motorcycle_repair": {"icon": "fas-motorcycle", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
diff --git a/data/presets/presets/shop/military_surplus.json b/data/presets/presets/shop/military_surplus.json
new file mode 100644
index 000000000..6b180074d
--- /dev/null
+++ b/data/presets/presets/shop/military_surplus.json
@@ -0,0 +1,20 @@
+{
+    "icon": "temaki-military",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "armor",
+        "army-navy store",
+        "army surplus",
+        "navy surplus",
+        "tactical gear",
+        "war surplus shop",
+        "weapons"
+    ],
+    "tags": {
+        "shop": "military_surplus"
+    },
+    "name": "Military Surplus Store"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 12f597588..58e8a3419 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -983,6 +983,7 @@
     {"key": "shop", "value": "mall", "description": "🄿 Mall", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "massage", "description": "🄿 Massage Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/spa.svg?sanitize=true"},
     {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "military_surplus", "description": "🄿 Military Surplus Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"},
     {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-mobile-alt.svg?sanitize=true"},
     {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-motorcycle.svg?sanitize=true"},
@@ -1893,6 +1894,7 @@
     {"key": "route", "value": "ncn", "description": "🄳 ➜ route=bicycle + network=ncn"},
     {"key": "shop", "value": "adult", "description": "🄳 ➜ shop=erotic"},
     {"key": "shop", "value": "antique", "description": "🄳 ➜ shop=antiques"},
+    {"key": "shop", "value": "army_surplus", "description": "🄳 ➜ shop=military_surplus"},
     {"key": "shop", "value": "auto_parts", "description": "🄳 ➜ shop=car_parts"},
     {"key": "shop", "value": "baby", "description": "🄳 ➜ shop=baby_goods"},
     {"key": "shop", "value": "baby_care", "description": "🄳 ➜ shop=baby_goods"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 10a6e08a5..0c4af83c9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8490,6 +8490,10 @@
                     "name": "Medical Supply Store",
                     "terms": ""
                 },
+                "shop/military_surplus": {
+                    "name": "Military Surplus Store",
+                    "terms": "armor,army-navy store,army surplus,navy surplus,tactical gear,war surplus shop,weapons"
+                },
                 "shop/mobile_phone": {
                     "name": "Mobile Phone Store",
                     "terms": ""