diff --git a/nimble/host/services/gap/src/ble_svc_gap.c b/nimble/host/services/gap/src/ble_svc_gap.c
index bfdd0cf49..49ccf9d05 100644
--- a/nimble/host/services/gap/src/ble_svc_gap.c
+++ b/nimble/host/services/gap/src/ble_svc_gap.c
@@ -32,8 +32,8 @@
      MYNEWT_VAL(BLE_SVC_GAP_PPCP_SLAVE_LATENCY) || \
      MYNEWT_VAL(BLE_SVC_GAP_PPCP_SUPERVISION_TMO))
 
-/* XXX: This should be configurable. */
-#define BLE_SVC_GAP_NAME_MAX_LEN    31
+#define BLE_SVC_GAP_NAME_MAX_LEN \
+    MYNEWT_VAL(BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH)
 
 static ble_svc_gap_chr_changed_fn *ble_svc_gap_chr_changed_cb_fn;
 
diff --git a/nimble/host/services/gap/syscfg.yml b/nimble/host/services/gap/syscfg.yml
index 11aeaa94c..136ac4206 100644
--- a/nimble/host/services/gap/syscfg.yml
+++ b/nimble/host/services/gap/syscfg.yml
@@ -33,6 +33,9 @@ syscfg.defs:
                 BLE_GATT_CHR_F_WRITE_AUTHOR
             Set to '-1' to make characteristic read only.
         value: -1
+    BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH:
+        description: Maximum length for "Device Name" characteristics
+        value: 31
     BLE_SVC_GAP_APPEARANCE:
         description: 'Device appearance'
         value: 0