diff --git a/addons/game.controller.ouya/addon.xml b/addons/game.controller.ouya/addon.xml
new file mode 100644
index 0000000000000..eae5302185660
--- /dev/null
+++ b/addons/game.controller.ouya/addon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="game.controller.ouya"
+        name="OUYA Controller"
+        version="1.0.0"
+        provider-name="Quihico">
+    <requires>
+    </requires>
+    <extension point="kodi.game.controller" library="resources/layout.xml"/>
+    <extension point="xbmc.addon.metadata">
+        <summary lang="en_GB">OUYA controller</summary>
+        <description lang="en_GB">The OUYA is a crowd-funded Android-based microconsole released in 2013. The OUYA controller includes a single-touch touchpad in the center of the controller.</description>
+        <disclaimer lang="en_GB"></disclaimer>
+        <platform>all</platform>
+        <assets>
+            <icon>resources/icon.png</icon>
+            <fanart>resources/fanart.jpg</fanart>
+        </assets>
+    </extension>
+</addon>
diff --git a/addons/game.controller.ouya/resources/fanart.jpg b/addons/game.controller.ouya/resources/fanart.jpg
new file mode 100644
index 0000000000000..c1bcfd5ace33f
Binary files /dev/null and b/addons/game.controller.ouya/resources/fanart.jpg differ
diff --git a/addons/game.controller.ouya/resources/icon.png b/addons/game.controller.ouya/resources/icon.png
new file mode 100644
index 0000000000000..e0f9d7d6d0cdb
Binary files /dev/null and b/addons/game.controller.ouya/resources/icon.png differ
diff --git a/addons/game.controller.ouya/resources/language/resource.language.en_gb/strings.po b/addons/game.controller.ouya/resources/language/resource.language.en_gb/strings.po
new file mode 100644
index 0000000000000..e3463b83fbee3
--- /dev/null
+++ b/addons/game.controller.ouya/resources/language/resource.language.en_gb/strings.po
@@ -0,0 +1,81 @@
+# Kodi Media Center language file
+# Addon Name: Ouya Controller
+# Addon id: game.controller.ouya
+# Addon Provider: Quihico
+msgid ""
+msgstr ""
+"Project-Id-Version: game.controller.ouya\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: 2014-05-30 17:00+8\n"
+"PO-Revision-Date: 2014-05-30 17:00+8\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "OUYA"
+msgstr ""
+
+msgctxt "#30001"
+msgid "O"
+msgstr ""
+
+msgctxt "#30002"
+msgid "U"
+msgstr ""
+
+msgctxt "#30003"
+msgid "Y"
+msgstr ""
+
+msgctxt "#30004"
+msgid "A"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Up"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Right"
+msgstr ""
+
+msgctxt "#30007"
+msgid "Down"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Left"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Left Bumper"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Right Bumper"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Left Trigger"
+msgstr ""
+
+msgctxt "#30012"
+msgid "Right Trigger"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Left Stick"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Right Stick"
+msgstr ""
+
+msgctxt "#30015"
+msgid "Touchpad"
+msgstr ""
\ No newline at end of file
diff --git a/addons/game.controller.ouya/resources/layout.png b/addons/game.controller.ouya/resources/layout.png
new file mode 100644
index 0000000000000..39e27efc5113c
Binary files /dev/null and b/addons/game.controller.ouya/resources/layout.png differ
diff --git a/addons/game.controller.ouya/resources/layout.xml b/addons/game.controller.ouya/resources/layout.xml
new file mode 100644
index 0000000000000..868a3fec5c7c4
--- /dev/null
+++ b/addons/game.controller.ouya/resources/layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<layout label="30000" image="layout.png" mask="mask.png">
+  <category name="face" label="35074">
+    <button name="a" type="digital" label="30001"/>
+    <button name="b" type="digital" label="30002"/>
+    <button name="x" type="digital" label="30003"/>
+    <button name="y" type="digital" label="30004"/>
+    <button name="up" type="digital" label="30005"/>
+    <button name="right" type="digital" label="30006"/>
+    <button name="down" type="digital" label="30007"/>
+    <button name="left" type="digital" label="30008"/>
+  </category>
+  <category name="shoulder" label="35075">
+    <button name="leftbumper" type="digital" label="30009"/>
+    <button name="rightbumper" type="digital" label="30010"/>
+  </category>
+  <category name="triggers" label="35076">
+    <button name="lefttrigger" type="digital" label="30011"/>
+    <button name="righttrigger" type="digital" label="30012"/>
+  </category>
+  <category name="analogsticks" label="35077">
+    <analogstick name="leftstick" label="30013"/>
+    <analogstick name="rightstick" label="30014"/>
+  </category>
+  <category name="pointer" label="35104">
+    <relpointer name="pointer" label="30015"/>
+    <abspointer name="touch"/>
+  </category>
+</layout>
diff --git a/addons/game.controller.ouya/resources/mask.png b/addons/game.controller.ouya/resources/mask.png
new file mode 100644
index 0000000000000..ed7971bfc85a9
Binary files /dev/null and b/addons/game.controller.ouya/resources/mask.png differ