diff --git a/detailsBody.html b/detailsBody.html
index 9c43f94..494fff5 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -35,11 +35,25 @@
{% endif %}
-{% if attribute(tags, 'name:etymology') %}
+{% if attribute(tags, 'name:etymology') or attribute(tags, 'name:etymology:wikidata') %}
{{ keyTrans('name:etymology') }}:
- {{ enumerate(attribute(tags, "name:etymology")) }}
+
+ {% set etymWikidata = attribute(tags, 'name:etymology:wikidata') %}
+ {% if etymWikidata %}
+ {% set etymWikidata = etymWikidata|split(';') %}
+ {% set etymName = attribute(tags, 'name:etymology')|split(';') %}
+
+ {% set result = [] %}
+ {% for i in 0..max(etymName|length - 1, etymWikidata|length - 1) %}
+ {% set result = result|merge([ etymWikidata[i] ? '' ~ (etymName[i]|default(etymWikidata[i]))|e ~ '' : etymName[i]|e ]) %}
+ {% endfor %}
+ {{ result|enumerate|raw }}
+ {% else %}
+ {{ attribute(tags, "name:etymology")|enumerate }}
+ {% endif %}
+
{% endif %}
diff --git a/popupBody.html b/popupBody.html
index 1aa1344..caf7579 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -35,11 +35,25 @@
{% endif %}
-{% if attribute(tags, 'name:etymology') %}
+{% if attribute(tags, 'name:etymology') or attribute(tags, 'name:etymology:wikidata') %}
{{ keyTrans('name:etymology') }}:
- {{ enumerate(attribute(tags, "name:etymology")) }}
+
+ {% set etymWikidata = attribute(tags, 'name:etymology:wikidata') %}
+ {% if etymWikidata %}
+ {% set etymWikidata = etymWikidata|split(';') %}
+ {% set etymName = attribute(tags, 'name:etymology')|split(';') %}
+
+ {% set result = [] %}
+ {% for i in 0..max(etymName|length - 1, etymWikidata|length - 1) %}
+ {% set result = result|merge([ etymWikidata[i] ? '' ~ (etymName[i]|default(etymWikidata[i]))|e ~ '' : etymName[i]|e ]) %}
+ {% endfor %}
+ {{ result|enumerate|raw }}
+ {% else %}
+ {{ enumerate(attribute(tags, "name:etymology")) }}
+ {% endif %}
+
{% endif %}