diff --git a/helper/type_mapping.js b/helper/type_mapping.js
index 59dbb590..fde1fab1 100644
--- a/helper/type_mapping.js
+++ b/helper/type_mapping.js
@@ -48,7 +48,7 @@ var LAYERS_BY_SOURCE = {
  openstreetmap: [ 'address', 'venue' ],
  openaddresses: [ 'address' ],
  geonames: [ 'country','macroregion', 'region', 'county','localadmin',
-  'locality', 'neighbourhood', 'venue' ],
+  'locality','borough', 'neighbourhood', 'venue' ],
  whosonfirst: [ 'continent', 'country', 'dependency', 'macroregion', 'region',
    'locality', 'localadmin', 'macrocounty', 'county', 'macrohood', 'borough',
    'neighbourhood', 'microhood', 'disputed']
diff --git a/test/unit/sanitiser/_sources_and_layers.js b/test/unit/sanitiser/_sources_and_layers.js
index dfb997fa..b943770c 100644
--- a/test/unit/sanitiser/_sources_and_layers.js
+++ b/test/unit/sanitiser/_sources_and_layers.js
@@ -52,6 +52,17 @@ module.exports.tests.no_errors = function(test, common) {
   });
 
 test('valid combination', function(t) {
+    var raw = {};
+    var clean = { sources: ['geonames'], layers: ['borough'] };
+
+    var messages = sanitize(raw, clean);
+
+    t.equal(messages.errors.length, 0, 'should return no errors');
+    t.equal(messages.warnings.length, 0, 'should return no warnings');
+    t.end();
+  });
+
+  test('valid combination', function(t) {
     var raw = {};
     var clean = { sources: ['geonames'], layers: ['macroregion'] };