diff --git a/data/address-formats.json b/data/address-formats.json
index 973535963e..418fd7defe 100644
--- a/data/address-formats.json
+++ b/data/address-formats.json
@@ -38,6 +38,10 @@
         {
             "countryCodes": ["tw"],
             "format": [["postcode", "city", "district"], ["place", "street"], ["housenumber", "floor"]]
+        },
+        {
+            "countryCodes": ["jp"],
+            "format": [["postcode", "province", "county"], ["city", "suburb", "quarter"], ["neighbourhood", "block_number", "housenumber"]]
         }
     ]
 }
diff --git a/data/presets.yaml b/data/presets.yaml
index d536bc5528..d0bae9c110 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -78,20 +78,24 @@ en:
         # access=*
         label: Access
       address:
-        # 'addr:city=*, addr:conscriptionnumber=*, addr:country=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:place=*, addr:postcode=*, addr:province=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
+        # 'addr:block_number=*, addr:city=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
         label: Address
         placeholders:
+          block_number: Block number
           city: City
           conscriptionnumber: '123'
           country: Country
+          county: County
           district: District
           floor: Floor
           hamlet: Hamlet
           housename: Housename
           housenumber: '123'
+          neighbourhood: Neighbourhood
           place: Place
           postcode: Postcode
           province: Province
+          quarter: Quarter
           state: State
           street: Street
           subdistrict: Subdistrict
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d7b964d762..6c52c9c701 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -79,17 +79,21 @@
         "address": {
             "type": "address",
             "keys": [
+                "addr:block_number",
                 "addr:city",
                 "addr:conscriptionnumber",
+                "addr:county",
                 "addr:country",
                 "addr:district",
                 "addr:floor",
                 "addr:hamlet",
                 "addr:housename",
                 "addr:housenumber",
+                "addr:neighbourhood",
                 "addr:place",
                 "addr:postcode",
                 "addr:province",
+                "addr:quarter",
                 "addr:state",
                 "addr:street",
                 "addr:subdistrict",
@@ -103,17 +107,21 @@
             "label": "Address",
             "strings": {
                 "placeholders": {
+                    "block_number": "Block number",
                     "city": "City",
                     "conscriptionnumber": "123",
+                    "county": "County",
                     "country": "Country",
                     "district": "District",
                     "floor": "Floor",
                     "hamlet": "Hamlet",
                     "housename": "Housename",
                     "housenumber": "123",
+                    "neighbourhood": "Neighbourhood",
                     "place": "Place",
                     "postcode": "Postcode",
                     "province": "Province",
+                    "quarter": "Quarter",
                     "state": "State",
                     "street": "Street",
                     "subdistrict": "Subdistrict",
diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
index 9d223b7442..ff1e5f5056 100644
--- a/data/presets/fields/address.json
+++ b/data/presets/fields/address.json
@@ -1,17 +1,21 @@
 {
     "type": "address",
     "keys": [
+        "addr:block_number",
         "addr:city",
         "addr:conscriptionnumber",
+        "addr:county",
         "addr:country",
         "addr:district",
         "addr:floor",
         "addr:hamlet",
         "addr:housename",
         "addr:housenumber",
+        "addr:neighbourhood",
         "addr:place",
         "addr:postcode",
         "addr:province",
+        "addr:quarter",
         "addr:state",
         "addr:street",
         "addr:subdistrict",
@@ -23,17 +27,21 @@
     "label": "Address",
     "strings": {
         "placeholders": {
+          "block_number": "Block number",
           "city": "City",
           "conscriptionnumber": "123",
+          "county": "County",
           "country": "Country",
           "district": "District",
           "floor": "Floor",
           "hamlet": "Hamlet",
           "housename": "Housename",
           "housenumber": "123",
+          "neighbourhood": "Neighbourhood",
           "place": "Place",
           "postcode": "Postcode",
           "province": "Province",
+          "quarter": "Quarter",
           "state": "State",
           "street": "Street",
           "subdistrict": "Subdistrict",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 44949de8fa..402a34324e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -703,17 +703,21 @@
                 "address": {
                     "label": "Address",
                     "placeholders": {
+                        "block_number": "Block number",
                         "city": "City",
                         "conscriptionnumber": "123",
+                        "county": "County",
                         "country": "Country",
                         "district": "District",
                         "floor": "Floor",
                         "hamlet": "Hamlet",
                         "housename": "Housename",
                         "housenumber": "123",
+                        "neighbourhood": "Neighbourhood",
                         "place": "Place",
                         "postcode": "Postcode",
                         "province": "Province",
+                        "quarter": "Quarter",
                         "state": "State",
                         "street": "Street",
                         "subdistrict": "Subdistrict",