diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index e3429ecbb..ca1ab41db 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1740,4 +1740,6 @@ railway|subway_entrance|hongkong;[railway=subway_entrance][city=hongkong];;name;
 railway|station|light_rail|berlin;[railway=station][station=light_rail][city=berlin],[railway=halt][station=light_rail][city=berlin];;name;int_name;1619;
 railway|station|subway|shenzhen;[railway=station][transport=subway][city=shenzhen],[railway=station][station=subway][city=shenzhen];;name;int_name;1620;
 railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name;int_name;1621;
-shop|hearing_aids;1622;
\ No newline at end of file
+shop|hearing_aids;1622;
+railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623;
+railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624;
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/subway-qingdao-m.svg b/data/styles/default/dark/symbols/subway-qingdao-m.svg
new file mode 100644
index 000000000..3ff7c9268
--- /dev/null
+++ b/data/styles/default/dark/symbols/subway-qingdao-m.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="a">
+   <path d="M 0,595.28 H 841.89 V 0 H 0 Z"/>
+  </clipPath>
+ </defs>
+ <circle cx="9" cy="9" r="9" fill="#fff" stroke-width="1.0155"/>
+ <g transform="matrix(.1215 0 0 -.1215 -24.188 45.172)" clip-path="url(#a)">
+  <path d="m248.41 268.41c-16.479 12.039-19.995 37.584-7.9145 53.944 10.698 15.931 33.502 21.637 50.466 12.709 16.996-8.1548 26.036-29.248 20.218-47.18-2.3907-7.6268-7.0122-15.028-13.659-19.41-0.87609 3.18-0.11234 6.8541-0.36886 10.221-0.20853 8.5414 0.48399 17.145-0.48904 25.635-2.4259 13.985-18.68 23.055-31.856 17.758-10.617-3.6193-16.939-15.035-15.793-25.961-0.0495-9.1313 0.1162-18.293-0.0656-27.406l-0.22739-0.22739zm75.673 3.142c-3.4439-6.1725-9.2364-11.344-16.211-13.452-12.747-4.5232-26.3-0.817-38.683 3.0538-4.9273 2.1841-27.28 0.67532-6.9117 4.5427 1.2971 2.0092 0.23417 5.244 0.58 7.7384 0.12941 9.3639-0.26468 18.761 0.2077 28.103 1.251 8.1682 12.984 11.08 17.907 4.443 3.8047-5.0006 1.8483-11.587 2.3342-17.398v-26.336c7.0584-3.2458 16.041-2.1574 23.451 0.0818 11.784 3.2956 17.172 15.596 19.405 26.58 4.9562 23.065-7.2651 48.346-28.445 58.762-21.801 11.633-51.022 5.5875-66.391-13.772-16.272-18.994-16.418-49.341-0.29909-68.477 2.4752-3.9906 10.578-7.3749 2.7383-9.8544-2.8055-2.6647-10.631-7.6523-9.139-10.739 13.299 6.9549 29.433 6.5052 43.099 0.7344 14.789-5.1026 33.287-6.533 45.876 4.4664 6.268 5.2169 10.057 12.885 11.101 20.905l-0.18138 0.436z" fill="#275140"/>
+ </g>
+ <circle cx="9" cy="9" r="9" fill-opacity=".36" stroke-width="1.0155"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/subway-qingdao-s.svg b/data/styles/default/dark/symbols/subway-qingdao-s.svg
new file mode 100644
index 000000000..cb34669f0
--- /dev/null
+++ b/data/styles/default/dark/symbols/subway-qingdao-s.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14" height="14" version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="a">
+   <path d="M 0,595.28 H 841.89 V 0 H 0 Z"/>
+  </clipPath>
+ </defs>
+ <circle cx="7" cy="7" r="7" fill="#fff" stroke-width=".78986"/>
+ <g transform="matrix(.0945 0 0 -.0945 -18.813 35.134)" clip-path="url(#a)">
+  <path d="m248.41 268.41c-16.479 12.039-19.995 37.584-7.9145 53.944 10.698 15.931 33.502 21.637 50.466 12.709 16.996-8.1548 26.036-29.248 20.218-47.18-2.3907-7.6268-7.0122-15.028-13.659-19.41-0.87609 3.18-0.11234 6.8541-0.36886 10.221-0.20853 8.5414 0.48399 17.145-0.48904 25.635-2.4259 13.985-18.68 23.055-31.856 17.758-10.617-3.6193-16.939-15.035-15.793-25.961-0.0495-9.1313 0.1162-18.293-0.0656-27.406l-0.22739-0.22739zm75.673 3.142c-3.4439-6.1725-9.2364-11.344-16.211-13.452-12.747-4.5232-26.3-0.817-38.683 3.0538-4.9273 2.1841-27.28 0.67532-6.9117 4.5427 1.2971 2.0092 0.23417 5.244 0.58 7.7384 0.12941 9.3639-0.26468 18.761 0.2077 28.103 1.251 8.1682 12.984 11.08 17.907 4.443 3.8047-5.0006 1.8483-11.587 2.3342-17.398v-26.336c7.0584-3.2458 16.041-2.1574 23.451 0.0818 11.784 3.2956 17.172 15.596 19.405 26.58 4.9562 23.065-7.2651 48.346-28.445 58.762-21.801 11.633-51.022 5.5875-66.391-13.772-16.272-18.994-16.418-49.341-0.29909-68.477 2.4752-3.9906 10.578-7.3749 2.7383-9.8544-2.8055-2.6647-10.631-7.6523-9.139-10.739 13.299 6.9549 29.433 6.5052 43.099 0.7344 14.789-5.1026 33.287-6.533 45.876 4.4664 6.268 5.2169 10.057 12.885 11.101 20.905l-0.18138 0.436z" fill="#275140"/>
+ </g>
+ <circle cx="7" cy="7" r="7" fill-opacity=".36" stroke-width=".78986"/>
+</svg>
diff --git a/data/styles/default/include/Subways.mapcss b/data/styles/default/include/Subways.mapcss
index 25a7ddc3b..f73594442 100644
--- a/data/styles/default/include/Subways.mapcss
+++ b/data/styles/default/include/Subways.mapcss
@@ -601,6 +601,11 @@ node|z13-[railway=station][transport=subway][city=pyongyang] {icon-image: subway
 node|z15-[railway=station][transport=subway][city=pyongyang] {icon-image: subway-pyongyang-m.svg;}
 node|z16-[railway=subway_entrance][city=pyongyang] {icon-image: subway-pyongyang-s.svg;}
 
+/* Qingdao Subway Station */
+node|z13-[railway=station][transport=subway][city=qingdao] {icon-image: subway-qingdao-s.svg;}
+node|z15-[railway=station][transport=subway][city=qingdao] {icon-image: subway-qingdao-m.svg;}
+node|z16-[railway=subway_entrance][city=qingdao] {icon-image: subway-qingdao-s.svg;}
+
 /* Rennes Subway Station */
 node|z13-[railway=station][transport=subway][city=rennes] {icon-image: subway-rennes-s.svg;}
 node|z15-[railway=station][transport=subway][city=rennes] {icon-image: subway-rennes-m.svg;}
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index c55da2e1d..e3dd46f36 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -221,6 +221,7 @@ railway-station-subway-panama                       # icon z13- (also has captio
 railway-station-subway-paris                        # icon z12- (also has caption(optional) z14-)
 railway-station-subway-philadelphia                 # icon z13- (also has caption(optional) z14-)
 railway-station-subway-pyongyang                    # icon z13- (also has caption(optional) z14-)
+railway-station-subway-qingdao                      # icon z13- (also has caption(optional) z14-)
 railway-station-subway-rennes                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-rio                          # icon z13- (also has caption(optional) z14-)
 railway-station-subway-roma                         # icon z12-16 (also has caption(optional) z14-16)
@@ -504,6 +505,7 @@ railway-subway_entrance-panama                      # icon z16- (also has captio
 railway-subway_entrance-paris                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-philadelphia                # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-pyongyang                   # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-qingdao                     # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rennes                      # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rio                         # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-roma                        # icon z16- (also has caption(optional) z17-)
@@ -1408,6 +1410,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station-subway-paris                      # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-philadelphia               # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-pyongyang                  # caption(optional) z14- (also has icon z13-)
+# railway-station-subway-qingdao                    # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-rennes                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-rio                        # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-roma                       # caption(optional) z14-16 (also has icon z12-16)
@@ -1647,6 +1650,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-paris                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-philadelphia              # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-pyongyang                 # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-qingdao                   # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rennes                    # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rio                       # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-roma                      # caption(optional) z17- (also has icon z16-)
diff --git a/data/styles/default/light/symbols/subway-qingdao-m.svg b/data/styles/default/light/symbols/subway-qingdao-m.svg
new file mode 100644
index 000000000..0b654f6e6
--- /dev/null
+++ b/data/styles/default/light/symbols/subway-qingdao-m.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="a">
+   <path d="M 0,595.28 H 841.89 V 0 H 0 Z"/>
+  </clipPath>
+ </defs>
+ <circle cx="9" cy="9" r="9" fill="#fff" stroke-width="1.0155"/>
+ <g transform="matrix(.1215 0 0 -.1215 -24.188 45.172)" clip-path="url(#a)">
+  <path d="m248.41 268.41c-16.479 12.039-19.995 37.584-7.9145 53.944 10.698 15.931 33.502 21.637 50.466 12.709 16.996-8.1548 26.036-29.248 20.218-47.18-2.3907-7.6268-7.0122-15.028-13.659-19.41-0.87609 3.18-0.11234 6.8541-0.36886 10.221-0.20853 8.5414 0.48399 17.145-0.48904 25.635-2.4259 13.985-18.68 23.055-31.856 17.758-10.617-3.6193-16.939-15.035-15.793-25.961-0.0495-9.1313 0.1162-18.293-0.0656-27.406l-0.22739-0.22739zm75.673 3.142c-3.4439-6.1725-9.2364-11.344-16.211-13.452-12.747-4.5232-26.3-0.817-38.683 3.0538-4.9273 2.1841-27.28 0.67532-6.9117 4.5427 1.2971 2.0092 0.23417 5.244 0.58 7.7384 0.12941 9.3639-0.26468 18.761 0.2077 28.103 1.251 8.1682 12.984 11.08 17.907 4.443 3.8047-5.0006 1.8483-11.587 2.3342-17.398v-26.336c7.0584-3.2458 16.041-2.1574 23.451 0.0818 11.784 3.2956 17.172 15.596 19.405 26.58 4.9562 23.065-7.2651 48.346-28.445 58.762-21.801 11.633-51.022 5.5875-66.391-13.772-16.272-18.994-16.418-49.341-0.29909-68.477 2.4752-3.9906 10.578-7.3749 2.7383-9.8544-2.8055-2.6647-10.631-7.6523-9.139-10.739 13.299 6.9549 29.433 6.5052 43.099 0.7344 14.789-5.1026 33.287-6.533 45.876 4.4664 6.268 5.2169 10.057 12.885 11.101 20.905l-0.18138 0.436z" fill="#275140"/>
+ </g>
+</svg>
diff --git a/data/styles/default/light/symbols/subway-qingdao-s.svg b/data/styles/default/light/symbols/subway-qingdao-s.svg
new file mode 100644
index 000000000..5e9fc2af8
--- /dev/null
+++ b/data/styles/default/light/symbols/subway-qingdao-s.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14" height="14" version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="a">
+   <path d="M 0,595.28 H 841.89 V 0 H 0 Z"/>
+  </clipPath>
+ </defs>
+ <circle cx="7" cy="7" r="7" fill="#fff" stroke-width=".78986"/>
+ <g transform="matrix(.0945 0 0 -.0945 -18.813 35.134)" clip-path="url(#a)">
+  <path d="m248.41 268.41c-16.479 12.039-19.995 37.584-7.9145 53.944 10.698 15.931 33.502 21.637 50.466 12.709 16.996-8.1548 26.036-29.248 20.218-47.18-2.3907-7.6268-7.0122-15.028-13.659-19.41-0.87609 3.18-0.11234 6.8541-0.36886 10.221-0.20853 8.5414 0.48399 17.145-0.48904 25.635-2.4259 13.985-18.68 23.055-31.856 17.758-10.617-3.6193-16.939-15.035-15.793-25.961-0.0495-9.1313 0.1162-18.293-0.0656-27.406l-0.22739-0.22739zm75.673 3.142c-3.4439-6.1725-9.2364-11.344-16.211-13.452-12.747-4.5232-26.3-0.817-38.683 3.0538-4.9273 2.1841-27.28 0.67532-6.9117 4.5427 1.2971 2.0092 0.23417 5.244 0.58 7.7384 0.12941 9.3639-0.26468 18.761 0.2077 28.103 1.251 8.1682 12.984 11.08 17.907 4.443 3.8047-5.0006 1.8483-11.587 2.3342-17.398v-26.336c7.0584-3.2458 16.041-2.1574 23.451 0.0818 11.784 3.2956 17.172 15.596 19.405 26.58 4.9562 23.065-7.2651 48.346-28.445 58.762-21.801 11.633-51.022 5.5875-66.391-13.772-16.272-18.994-16.418-49.341-0.29909-68.477 2.4752-3.9906 10.578-7.3749 2.7383-9.8544-2.8055-2.6647-10.631-7.6523-9.139-10.739 13.299 6.9549 29.433 6.5052 43.099 0.7344 14.789-5.1026 33.287-6.533 45.876 4.4664 6.268 5.2169 10.057 12.885 11.101 20.905l-0.18138 0.436z" fill="#275140"/>
+ </g>
+</svg>
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 58e720956..bb3e3f60a 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -221,6 +221,7 @@ railway-station-subway-panama                       # icon z13- (also has captio
 railway-station-subway-paris                        # icon z12- (also has caption(optional) z14-)
 railway-station-subway-philadelphia                 # icon z13- (also has caption(optional) z14-)
 railway-station-subway-pyongyang                    # icon z13- (also has caption(optional) z14-)
+railway-station-subway-qingdao                      # icon z13- (also has caption(optional) z14-)
 railway-station-subway-rennes                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-rio                          # icon z13- (also has caption(optional) z14-)
 railway-station-subway-roma                         # icon z12-16 (also has caption(optional) z14-16)
@@ -504,6 +505,7 @@ railway-subway_entrance-panama                      # icon z16- (also has captio
 railway-subway_entrance-paris                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-philadelphia                # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-pyongyang                   # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-qingdao                     # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rennes                      # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rio                         # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-roma                        # icon z16- (also has caption(optional) z17-)
@@ -1411,6 +1413,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station-subway-paris                      # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-philadelphia               # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-pyongyang                  # caption(optional) z14- (also has icon z13-)
+# railway-station-subway-qingdao                    # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-rennes                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-rio                        # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-roma                       # caption(optional) z14-16 (also has icon z12-16)
@@ -1650,6 +1653,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-paris                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-philadelphia              # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-pyongyang                 # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-qingdao                   # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rennes                    # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rio                       # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-roma                      # caption(optional) z17- (also has icon z16-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index e268d4e9c..9cae97d60 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -393,6 +393,7 @@ railway-station-subway-panama                       # icon z13- (also has captio
 railway-station-subway-paris                        # icon z12- (also has caption(optional) z15-)
 railway-station-subway-philadelphia                 # icon z13- (also has caption(optional) z15-)
 railway-station-subway-pyongyang                    # icon z13- (also has caption(optional) z15-)
+railway-station-subway-qingdao                      # icon z13- (also has caption(optional) z15-)
 railway-station-subway-rennes                       # icon z13- (also has caption(optional) z15-)
 railway-station-subway-rio                          # icon z13- (also has caption(optional) z15-)
 railway-station-subway-roma                         # icon z12-16 (also has caption(optional) z15-16)
@@ -640,6 +641,7 @@ railway-subway_entrance-panama                      # icon z16- (also has captio
 railway-subway_entrance-paris                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-philadelphia                # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-pyongyang                   # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-qingdao                     # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rennes                      # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-rio                         # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-roma                        # icon z16- (also has caption(optional) z17-)
@@ -925,6 +927,7 @@ entrance-main                                       # icon z18- (also has captio
 # railway-station-subway-paris                      # caption(optional) z15- (also has icon z12-)
 # railway-station-subway-philadelphia               # caption(optional) z15- (also has icon z13-)
 # railway-station-subway-pyongyang                  # caption(optional) z15- (also has icon z13-)
+# railway-station-subway-qingdao                    # caption(optional) z15- (also has icon z13-)
 # railway-station-subway-rennes                     # caption(optional) z15- (also has icon z13-)
 # railway-station-subway-rio                        # caption(optional) z15- (also has icon z13-)
 # railway-station-subway-roma                       # caption(optional) z15-16 (also has icon z12-16)
@@ -1126,6 +1129,7 @@ entrance-main                                       # icon z18- (also has captio
 # railway-subway_entrance-paris                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-philadelphia              # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-pyongyang                 # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-qingdao                   # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rennes                    # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-rio                       # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-roma                      # caption(optional) z17- (also has icon z16-)
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 806b2ca4c..4fb730f1c 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -521,6 +521,7 @@ string MatchCity(ms::LatLon const & ll)
       {"philadelphia", {-75.276761, 39.865446, -74.964493, 40.137768}},
       {"porto", {-8.758979,41.095783,-8.540001,41.378495}},
       {"pyongyang", {125.48888, 38.780932, 126.12748, 39.298738}},
+      {"qingdao", {119.708, 35.668, 120.758, 36.480}},
       {"rennes", {-2.28897,47.934093,-1.283944,48.379636}},
       {"rio", {-43.4873199463, -23.0348745407, -43.1405639648, -22.7134898498}},
       {"roma", {12.3348999023, 41.7672146942, 12.6397705078, 42.0105298189}},