diff --git a/config/addon/xbmc.python.module.xml b/config/addon/xbmc.python.module.xml
new file mode 100644
index 0000000000..4c55c2cad3
--- /dev/null
+++ b/config/addon/xbmc.python.module.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="@PKG_ADDON_ID@"
+       name="@PKG_NAME@"
+       version="@ADDON_VERSION@"
+       provider-name="@PROVIDER_NAME@">
+  <requires>
+    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+@REQUIRES@
+  </requires>
+  <extension point="xbmc.python.module" library="lib/">
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>
diff --git a/config/addon/addon.xml b/config/addon/xbmc.python.script.xml
similarity index 84%
rename from config/addon/addon.xml
rename to config/addon/xbmc.python.script.xml
index c26dd633ab..3615cda183 100644
--- a/config/addon/addon.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -8,9 +8,8 @@
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
-  <extension point="@PKG_ADDON_TYPE@"
-             library="default.py">
-        <provides>executable</provides>
+  <extension point="xbmc.python.script" library="default.py">
+    <provides>executable</provides>
   </extension>
 @EXTENSIONS@
   <extension point="xbmc.addon.metadata">
diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml
new file mode 100644
index 0000000000..a5c73678a3
--- /dev/null
+++ b/config/addon/xbmc.service.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="@PKG_ADDON_ID@"
+       name="@PKG_NAME@"
+       version="@ADDON_VERSION@"
+       provider-name="@PROVIDER_NAME@">
+  <requires>
+    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+@REQUIRES@
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides>executable</provides>
+  </extension>
+@EXTENSIONS@
+  <extension point="xbmc.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>
diff --git a/scripts/create_addon b/scripts/create_addon
index fe76177b26..4d6dce7de6 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -51,19 +51,19 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
     REQUIRES_ADDONVERSION=`echo $i | cut -f2 -d ":"`
     REQUIRES="$REQUIRES\n    <import addon=\"$REQUIRES_ADDONNAME\" version=\"$REQUIRES_ADDONVERSION\" />"
   done
-  
+
   for i in $PKG_ADDON_EXTENSIONS; do
     EXTENSIONS_POINT=`echo $i | cut -f1 -d ":"`
     EXTENSIONS_LIBRARY=`echo $i | cut -f2 -d ":"`
     EXTENSIONS_SERVICE_START=`echo $i | cut -f3 -d ":"`
     EXTENTION_TEMP="  <extension point=\"$EXTENSIONS_POINT\" library=\"$EXTENSIONS_LIBRARY\""
-    
+
     if [ "$EXTENSIONS_POINT" = "xbmc.service" -a -n "$EXTENSIONS_SERVICE_START" ]; then
       EXTENTION_TEMP="$EXTENTION_TEMP start=\"$EXTENSIONS_SERVICE_START\">"
     else
       EXTENTION_TEMP="$EXTENTION_TEMP>"
     fi
-    
+
     EXTENTION_TEMP="$EXTENTION_TEMP\n    <provides>executable</provides>\n  </extension>"
     EXTENSIONS="$EXTENSIONS\n$EXTENTION_TEMP"
   done
@@ -72,7 +72,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
   if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
-    cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+    cp config/addon/${PKG_ADDON_TYPE}.xml $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
     CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV"
     PROVIDER_NAME="openelec.tv"
     if [ ! -z "$PKG_MAINTAINER" ] ; then
@@ -81,7 +81,6 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
     $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
          -e "s|@PKG_NAME@|$PKG_NAME|g" \
          -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \
-         -e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \
          -e "s|@REQUIRES@|$REQUIRES|g" \
          -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
          -e "s|@OS_VERSION@|$OS_VERSION|g" \