diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index 285c98d..ec7e227 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -1119,6 +1119,25 @@
     </layout>
     <layout>
       <configItem>
+        <name>vn</name>
+        <!-- Keyboard indicator for Vietnamese layouts -->
+        <_shortDescription>vi</_shortDescription>
+        <_description>Vietnamese</_description>
+        <languageList>
+          <iso639Id>vie</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>aderty</name>
+            <_description>Vietnamese (AÐERTY)<_/description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>eu</name>
         <!-- Keyboard indicator for European layouts -->
         <_shortDescription>eu</_shortDescription>
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1d1185a..2c5de36 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5482,7 +5482,7 @@
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Vietnamese (US keyboard with Vietnamese letters)</_description>
+            <_description>Vietnamese (US, with Vietnamese letters)</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/symbols/vn b/symbols/vn
index d1b9ea8..3faa878 100644
--- a/symbols/vn
+++ b/symbols/vn
@@ -44,7 +44,7 @@ partial alphanumeric_keys
 xkb_symbols "us" {
 
     include "us(euro)"
-    name[Group1]= "Vietnamese (US keyboard with Vietnamese letters)";
+    name[Group1]= "Vietnamese (US, with Vietnamese letters)";
 
     key <TLDE> { [dead_grave, dead_tilde,              grave,          asciitilde ] };
     key <AE04> { [         4,     dollar,           DongSign,            currency ] }; // ₫ ¤
@@ -88,3 +88,32 @@ xkb_symbols "fr" {
     key <AB07> { [ dead_hook,   question,          comma ] };
     key <AB08> { [dead_belowdot,  period,      semicolon ] };
 };
+
+
+// EXTRAS:
+
+// Vietnamese AÐERTY adaptation
+//
+// Copyright (C) 2018, Florent Gallaire Phong <f@gallai.re>
+
+partial alphanumeric_keys
+xkb_symbols "aderty" {
+
+    include "fr(basic)"
+
+    name[Group1]="Vietnamese (AÐERTY)";
+
+    key <AE02> { [dead_tilde,          2,             eacute,          asciitilde ] };
+    key <AE04> { [dead_acute,          4,         apostrophe,           braceleft ] };
+    key <AE07> { [dead_grave,          7,             egrave,               grave ] };
+
+    key <AD02> { [   dstroke,    Dstroke,                  z,                   Z ] }; // đ Đ
+    key <AD12> { [    dollar,   sterling,           DongSign,            currency ] }; // ₫ ¤
+
+    key <AC04> { [     uhorn,      Uhorn,                  f,                   F ] }; // ư Ư
+    key <AC07> { [     ohorn,      Ohorn,                  j,                   J ] }; // ơ Ơ
+
+    key <AB01> { [    abreve,     Abreve,                  w,                   W ] }; // ă Ă
+    key <AB07> { [ dead_hook,   question,          comma ] };
+    key <AB08> { [dead_belowdot,  period,      semicolon ] };
+};