diff --git a/rules/base.xml.in b/rules/base.xml.in
index 97ae57c..a039b0f 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5888,6 +5888,40 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>id</name>
+        <shortDescription>id</shortDescription>
+        <description>Indonesian (Jawi)</description>
+        <languageList>
+          <iso639Id>id</iso639Id>
+          <iso639Id>ms</iso639Id>
+          <iso639Id>min</iso639Id>
+          <iso639Id>ace</iso639Id>
+          <iso639Id>bjn</iso639Id>
+          <iso639Id>tsg</iso639Id>
+          <iso639Id>mfa</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList></variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>my</name>
+        <shortDescription>ms</shortDescription>
+        <description>Malay (Jawi)</description>
+        <languageList>
+          <iso639Id>id</iso639Id>
+          <iso639Id>ms</iso639Id>
+          <iso639Id>min</iso639Id>
+          <iso639Id>ace</iso639Id>
+          <iso639Id>bjn</iso639Id>
+          <iso639Id>tsg</iso639Id>
+          <iso639Id>mfa</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList></variantList>
+    </layout>
   </layoutList>
   <optionList>
     <group allowMultipleSelection="true">
diff --git a/symbols/id b/symbols/id
index e69de29..f32eb0f 100644
--- a/symbols/id
+++ b/symbols/id
@@ -0,0 +1,79 @@
+// Modified from Arabic (buckwalter)
+default partial alphanumeric_keys
+xkb_symbols "jawi" {
+    name[Group1]= "Indonesian (Jawi)";
+
+    // ARABIC LETTER SUPERSCRIPT ALEF
+    key <TLDE> {  [       0x1000670,   Arabic_shadda       ]       };
+
+    key <AE01> {  [       0x1000661,   exclam             ]       };
+    key <AE02> {  [       0x1000662,   at                 ]       };
+    key <AE03> {  [       0x1000663,   numbersign         ]       };
+    // ARABIC INVERTED DAMMA
+    key <AE04> {  [       0x1000664,   0x1000657          ]       };
+    key <AE05> {  [       0x1000665,   Arabic_percent     ]       };
+    key <AE06> {  [       0x1000666,   asciicircum        ]       };
+    key <AE07> {  [       0x1000667,   ampersand          ]       };
+    key <AE08> {  [       0x1000668,   asterisk           ]       };
+    // ORNATE LEFT PARENTHESIS
+    key <AE09> {  [       0x1000669,   0x100fd3e          ]       };
+    // ORNATE RIGHT PARENTHESIS
+    key <AE10> {  [       0x1000660,   0x100fd3f          ]       };
+    key <AE11> {  [       minus,       Arabic_tatweel     ]       };
+    key <AE12> {  [       equal,       plus               ]       };
+						
+    key <AD01> {  [      Arabic_qaf,   Arabic_hamza       ]       };
+    key <AD02> {  [      Arabic_waw,   Arabic_hamzaonwaw  ]       };
+    // ARABIC LETTER YEH WITH SMALL V 0x10006ce (my proposal for E)
+    key <AD03> {  [      Arabic_yeh,    Arabic_ain         ]       };
+    // ARABIC SUBSCRIPT ALEF
+    key <AD04> {  [      Arabic_ra,    0x1000656          ]       };
+    key <AD05> {  [      Arabic_teh,   Arabic_tah         ]       };
+    key <AD06> {  [      Arabic_yeh,   Arabic_alefmaksura ]       };
+    key <AD07> {  [      Arabic_damma, Arabic_hamzaonalef ]       };
+    key <AD08> {  [      Arabic_kasra, Arabic_hamzaunderalef ]    };
+    // ARABIC LETTER OE 0x10006c6 (my proposal for O)
+    key <AD09> {  [      Arabic_waw,    Arabic_sukun       ]       };
+    // ARABIC LETTER VEH
+    key <AD10> {  [      0x10006a4,    Arabic_tehmarbuta  ]       };
+    // ARABIC LETTER ALEF WASLA
+    key <AD11> {  [      Arabic_fathatan, 0x1000671       ]       };
+    key <AD12> {  [    Arabic_kasratan, Arabic_hamzaonyeh ]       };
+
+    key <AC01> {  [    Arabic_fatha,   Arabic_alef        ]       };
+    key <AC02> {  [    Arabic_seen,    Arabic_sad         ]       };
+    key <AC03> {  [    Arabic_dal,     Arabic_dad         ]       };
+    key <AC04> {  [    Arabic_feh,     backslash          ]       };
+    // ARABIC LETTER KEHEH WITH DOT ABOVE
+    key <AC05> {  [    0x1000762,     Arabic_ghain        ]       };
+    key <AC06> {  [    Arabic_ha,      Arabic_hah         ]       };
+    // ARABIC LETTER KEH WITH DOT ABOVE
+    key <AC07> {  [    Arabic_jeem,    0x10006ac          ]       };
+    // ARABIC LETTER KEHEH
+    key <AC08> {  [    Arabic_kaf,     0x10006a9          ]       };
+    // ARABIC MADDAH ABOVE
+    key <AC09> {  [    Arabic_lam,     0x1000653          ]       };
+    key <AC10> {  [    Arabic_semicolon, colon            ]       };
+    key <AC11> {  [    apostrophe,	quotedbl          ]       };
+
+    key <BKSL> {  [ Arabic_dammatan,   Arabic_maddaonalef ]     };
+
+//    key <LSGT> {  [             bar,      brokenbar	  ]     };
+
+    key <AB01> {  [    Arabic_zain,    Arabic_zah         ]       };
+    key <AB02> {  [    Arabic_khah,    Arabic_sheen       ]       };
+    // ARABIC LETTER TCHEH
+    key <AB03> {  [    0x1000686,     Arabic_thal        ]       };
+    // ARABIC LETTER WAW WITH DOT ABOVE
+    key <AB04> {  [    0x10006cf,     Arabic_theh        ]       };
+    key <AB05> {  [    Arabic_beh,     less         ]       };
+    // ARABIC LETTER NOON WITH THREE DOTS ABOVE
+    key <AB06> {  [    Arabic_noon,    0x10006bd    ]       };
+    key <AB07> {  [    Arabic_meem,    greater         ]       };
+    // »
+    key <AB08> {  [    Arabic_comma,   0x10000bb ]    };
+    // ARABIC FULL STOP (Urdu), «
+    key <AB09> {  [    0x10006d4,      0x10000ab ]       };
+    key <AB10> {  [    slash,     Arabic_question_mark ]     };
+};
+
diff --git a/symbols/my b/symbols/my
index e69de29..22cebef 100644
--- a/symbols/my
+++ b/symbols/my
@@ -0,0 +1,7 @@
+default partial alphanumeric_keys
+xkb_symbols "jawi" {
+    include "id(jawi)"
+
+    name[Group1]= "Malay (Jawi)";
+};
+