diff --git a/data/languages/xtensa.dwarf b/data/languages/xtensa.dwarf
new file mode 100644
index 0000000..afe6a2e
--- /dev/null
+++ b/data/languages/xtensa.dwarf
@@ -0,0 +1,7 @@
+<dwarf>
+    <register_mappings>
+        <register_mapping dwarf="0" ghidra="a0"/>
+        <register_mapping dwarf="1" ghidra="a1" stackpointer="true"/>
+        <register_mapping dwarf="2" ghidra="a2" auto_count="13"/> <!-- a2..a15 -->
+    </register_mappings>
+</dwarf>
diff --git a/data/languages/xtensa.ldefs b/data/languages/xtensa.ldefs
index 4a4d460..7d6c2c1 100644
--- a/data/languages/xtensa.ldefs
+++ b/data/languages/xtensa.ldefs
@@ -12,5 +12,6 @@
             id="Xtensa:LE:32:default">
     <description>Tensilica Xtensa 32-bit little-endian</description>
     <compiler name="default" spec="xtensa.cspec" id="default"/>
+<!--  <external_name tool="DWARF.register.mapping.file" name="xtensa.dwarf"/> -->
   </language>
 </language_definitions>