diff --git a/config/addon/xbmc.python.module.xml b/config/addon/xbmc.python.module.xml
index 4c55c2cad3..1a1f1a1440 100644
--- a/config/addon/xbmc.python.module.xml
+++ b/config/addon/xbmc.python.module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_NAME@"
+       name="@ADDON_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
diff --git a/config/addon/xbmc.python.script.xml b/config/addon/xbmc.python.script.xml
index dc15262813..54cfab033e 100644
--- a/config/addon/xbmc.python.script.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_NAME@"
+       name="@ADDON_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml
index 72eddf63a5..26e0ed4ce8 100644
--- a/config/addon/xbmc.service.xml
+++ b/config/addon/xbmc.service.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_NAME@"
+       name="@ADDON_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
diff --git a/scripts/create_addon b/scripts/create_addon
index 08dcdfe880..96b304b7a7 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -81,8 +81,12 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
   if [ ! -z "$PKG_MAINTAINER" ] ; then
     PROVIDER_NAME="$PKG_MAINTAINER"
   fi
+  ADDON_NAME="$PKG_NAME"
+  if [ ! -z "$PKG_ADDON_NAME" ] ; then
+    ADDON_NAME="$PKG_ADDON_NAME"
+  fi
   $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-       -e "s|@PKG_NAME@|$PKG_NAME|g" \
+       -e "s|@ADDON_NAME@|$ADDON_NAME|g" \
        -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
        -e "s|@REQUIRES@|$REQUIRES|g" \
        -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \