diff --git a/.gitattributes b/.gitattributes
index fc2fc654ca..3d676226f9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4820,6 +4820,7 @@ lcl/interfaces/android/Makefile.compiled svneol=native#text/pascal
 lcl/interfaces/android/Makefile.fpc svneol=native#text/text
 lcl/interfaces/android/androidint.pas svneol=native#text/pascal
 lcl/interfaces/android/androidobject.inc svneol=native#text/pascal
+lcl/interfaces/android/interfaces.pp svneol=native#text/plain
 lcl/interfaces/carbon/Makefile.compiled svneol=native#text/plain
 lcl/interfaces/carbon/README.txt svneol=native#text/plain
 lcl/interfaces/carbon/agl.pp svneol=native#text/plain
diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index ddf4db221b..8ac2a90ab6 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -124,7 +124,7 @@ const
     'FPC', 'ObjFPC', 'Delphi', 'TP', 'MacPas'
     );
 
-  Lazarus_CPU_OS_Widget_Combinations: array[1..64] of shortstring = (
+  Lazarus_CPU_OS_Widget_Combinations: array[1..65] of shortstring = (
     'i386-linux-gtk',
     'i386-linux-gtk2',
     'i386-linux-qt',
@@ -173,6 +173,7 @@ const
     'arm-linux-gtk',
     'arm-linux-gtk2',
     'arm-linux-qt',
+    'arm-linux-android',
     'arm-linux-nogui',
     'arm-darwin-carbon',
     'arm-darwin-nogui',
diff --git a/lcl/interfaces/android/interfaces.pp b/lcl/interfaces/android/interfaces.pp
new file mode 100644
index 0000000000..e24254cf4c
--- /dev/null
+++ b/lcl/interfaces/android/interfaces.pp
@@ -0,0 +1,46 @@
+{ 
+ /*************************************************************************** 
+                         Interfaces.pp  -  determines what interface to use
+                             ------------------- 
+ 
+                   Initial Revision  : Thu July 1st CST 1999 
+ 
+ 
+ ***************************************************************************/ 
+ 
+ *****************************************************************************
+ *                                                                           *
+ *  This file is part of the Lazarus Component Library (LCL)                 *
+ *                                                                           *
+ *  See the file COPYING.modifiedLGPL.txt, included in this distribution,    * 
+ *  for details about the copyright.                                         *
+ *                                                                           *
+ *  This program is distributed in the hope that it will be useful,          *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ *****************************************************************************
+}
+
+
+unit interfaces;
+ 
+{$mode objfpc} 
+
+interface
+
+uses 
+  InterfaceBase;
+
+implementation
+
+uses 
+  androidint, Forms;
+
+initialization
+  CreateWidgetset(TAndroidWidgetSet);
+
+finalization
+  FreeWidgetset;
+
+end.
diff --git a/lcl/interfaces/lcl1.lpk b/lcl/interfaces/lcl1.lpk
index 48be650966..9de11edcef 100644
--- a/lcl/interfaces/lcl1.lpk
+++ b/lcl/interfaces/lcl1.lpk
@@ -97,7 +97,7 @@ end;"/>
     <License Value="modified LGPL-2
 "/>
     <Version Minor="9" Release="29"/>
-    <Files Count="302">
+    <Files Count="303">
       <Item1>
         <Filename Value="lclintfcompile.pas"/>
         <UnitName Value="LCLIntfCompile"/>
@@ -1508,6 +1508,10 @@ end;"/>
         <Filename Value="android/androidobject.inc"/>
         <Type Value="Include"/>
       </Item302>
+      <Item303>
+        <Filename Value="android/interfaces.pp"/>
+        <UnitName Value="interfaces"/>
+      </Item303>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>