diff --git a/config/addon/xbmc.python.module.xml b/config/addon/xbmc.python.module.xml
index 430fc35f5e..778c4d7b91 100644
--- a/config/addon/xbmc.python.module.xml
+++ b/config/addon/xbmc.python.module.xml
@@ -23,5 +23,10 @@
     <news>
 @PKG_ADDON_NEWS@
     </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
   </extension>
 </addon>
diff --git a/config/addon/xbmc.python.script.xml b/config/addon/xbmc.python.script.xml
index fc52d36f99..02a9d71c8d 100644
--- a/config/addon/xbmc.python.script.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -23,5 +23,10 @@
     <news>
 @PKG_ADDON_NEWS@
     </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
   </extension>
 </addon>
diff --git a/config/addon/xbmc.service.pluginsource.xml b/config/addon/xbmc.service.pluginsource.xml
index 959ad6df56..c73048e4f9 100644
--- a/config/addon/xbmc.service.pluginsource.xml
+++ b/config/addon/xbmc.service.pluginsource.xml
@@ -25,5 +25,10 @@
     <news>
 @PKG_ADDON_NEWS@
     </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
   </extension>
 </addon>
diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml
index 1e5f7dd582..c7c856d7ba 100644
--- a/config/addon/xbmc.service.xml
+++ b/config/addon/xbmc.service.xml
@@ -23,5 +23,10 @@
     <news>
 @PKG_ADDON_NEWS@
     </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
   </extension>
 </addon>
diff --git a/distributions/LibreELEC/addons/fanart.png b/distributions/LibreELEC/addons/fanart.png
new file mode 100644
index 0000000000..6067574f43
Binary files /dev/null and b/distributions/LibreELEC/addons/fanart.png differ
diff --git a/scripts/create_addon b/scripts/create_addon
index 34726c43f4..ae190e9bb6 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -66,14 +66,26 @@ pack_addon() {
     ADDONVER=$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml)
   fi
 
-  if [ -f $PKG_DIR/source/default.py ]; then
+  if [ -d $PKG_DIR/source ]; then
     cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
   fi
 
   if [ -f $PKG_DIR/icon/icon.png ]; then
-    cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
+    mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/resources
+    cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID/resources
   fi
 
+  if [ -f $DISTRO_DIR/$DISTRO/addons/fanart.png ]; then
+   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/resources
+   cp $DISTRO_DIR/$DISTRO/addons/fanart.png $ADDON_BUILD/$PKG_ADDON_ID/resources
+  fi
+
+  for f in $PKG_DIR/source/resources/screenshot-*.{jpg,png}; do
+    if [ -f "$f" ]; then
+      PKG_ADDON_SCREENSHOT+="<screenshot>resources/$(basename $f)</screenshot>\n"
+    fi
+  done
+
   if [ -f $PKG_DIR/changelog.txt ]; then
     sed -e "/@PKG_ADDON_NEWS@/ \
            {
@@ -102,6 +114,7 @@ pack_addon() {
        -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
        -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
        -e "s|@PKG_ADDON_PROVIDES@|$PKG_ADDON_PROVIDES|g" \
+       -e "s|@PKG_ADDON_SCREENSHOT@|$PKG_ADDON_SCREENSHOT|g" \
        -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
 
   if [ "$2" != "-test" ] ; then
@@ -120,9 +133,16 @@ pack_addon() {
     if [ -f $ADDON_BUILD/$PKG_ADDON_ID/changelog.txt ]; then
       cp $ADDON_BUILD/$PKG_ADDON_ID/changelog.txt $ADDON_INSTALL_DIR/changelog-$ADDONVER.txt
     fi
-    if [ -f $ADDON_BUILD/$PKG_ADDON_ID/icon.png ]; then
-      cp $ADDON_BUILD/$PKG_ADDON_ID/icon.png $ADDON_INSTALL_DIR/icon.png
+    if [ -f $ADDON_BUILD/$PKG_ADDON_ID/resources/icon.png ]; then
+      mkdir -p $ADDON_INSTALL_DIR/resources
+      cp $ADDON_BUILD/$PKG_ADDON_ID/resources/icon.png $ADDON_INSTALL_DIR/resources/icon.png
     fi
+    for f in $ADDON_BUILD/$PKG_ADDON_ID/resources/screenshot-*.{jpg,png}; do
+      if [ -f "$f" ]; then
+        mkdir -p $ADDON_INSTALL_DIR/resources
+        cp $f $ADDON_INSTALL_DIR/resources
+      fi
+    done
   fi
 }