diff --git a/config/addon/addon.xml b/config/addon/addon.xml
index f528f9c914..6cba11fb76 100644
--- a/config/addon/addon.xml
+++ b/config/addon/addon.xml
@@ -2,7 +2,7 @@
 <addon id="@PKG_ADDON_ID@"
        name="@PKG_NAME@"
        version="@ADDON_VERSION@"
-       provider-name="openelec.tv">
+       provider-name="@PROVIDER_NAME@">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/scripts/create_addon b/scripts/create_addon
index 0f82bf8df1..88035ba73e 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -56,6 +56,10 @@ if [ -f $PKG_DIR/addon ]; then
     if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
       cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
       CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV"
+      PROVIDER_NAME="openelec.tv"
+      if [ ! -z "$PKG_MAINTAINER" ] ; then
+        PROVIDER_NAME="$PKG_MAINTAINER"
+      fi
       $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" \
@@ -65,6 +69,7 @@ if [ -f $PKG_DIR/addon ]; then
            -e "s|@OS_VERSION@|$OS_VERSION|g" \
            -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
            -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
+           -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
            -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
     else
       CUST_ADDON_VERSION="$PKG_VERSION"