diff --git a/config/addon/xbmc.python.script.xml b/config/addon/xbmc.python.script.xml
index 3615cda183..dc15262813 100644
--- a/config/addon/xbmc.python.script.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -11,7 +11,6 @@
   <extension point="xbmc.python.script" library="default.py">
     <provides>executable</provides>
   </extension>
-@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>
diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml
index a5c73678a3..72eddf63a5 100644
--- a/config/addon/xbmc.service.xml
+++ b/config/addon/xbmc.service.xml
@@ -11,7 +11,6 @@
   <extension point="xbmc.service" library="default.py">
     <provides>executable</provides>
   </extension>
-@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>
diff --git a/scripts/create_addon b/scripts/create_addon
index 1e7ecd6ef8..61c11bb8fb 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -52,22 +52,6 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
     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
-
   unset IFS
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
@@ -86,7 +70,6 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
          -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
          -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
          -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
-         -e "s|@EXTENSIONS@|$EXTENSIONS|g" \
          -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
   fi