diff --git a/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk b/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk
index a579d999db..8453b9d001 100644
--- a/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk
+++ b/packages/addons/addon-depends/mono-depends/mono_sqlite/package.mk
@@ -16,7 +16,7 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-. $ROOT/$PACKAGES/databases/sqlite/package.mk
+. "$ROOT/packages/databases/sqlite/package.mk"
 
 PKG_NAME="mono_sqlite"
 PKG_URL=""
diff --git a/packages/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk
index 2fe396d95a..d3b3553540 100644
--- a/packages/addons/tools/mono/package.mk
+++ b/packages/addons/tools/mono/package.mk
@@ -61,23 +61,16 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  make -C "$ROOT/$PKG_BUILD/.$HOST_NAME" install DESTDIR="$INSTALL"
+  make -C "$ROOT/$PKG_BUILD/.$TARGET_NAME" install DESTDIR="$INSTALL"
+  rm -fr "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/include"
+  rm -fr "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/share/man"
+  $STRIP "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/bin/mono"
 }
 
 addon() {
   mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID"  
-
-  make -C "$PKG_BUILD/.$HOST_NAME" install DESTDIR="$ROOT/$ADDON_BUILD/$PKG_ADDON_ID"
-  make -C "$PKG_BUILD/.$TARGET_NAME" install DESTDIR="$ROOT/$ADDON_BUILD/$PKG_ADDON_ID"
-
-  mv "$ADDON_BUILD/$PKG_ADDON_ID/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"/* \
-     "$ADDON_BUILD/$PKG_ADDON_ID/"
-
-  rm -fr "$ADDON_BUILD/$PKG_ADDON_ID/storage"
-  rm -fr "$ADDON_BUILD/$PKG_ADDON_ID/include"
-  rm -fr "$ADDON_BUILD/$PKG_ADDON_ID/share/man"
-
-  $STRIP "$ADDON_BUILD/$PKG_ADDON_ID/bin/mono"
+  cp -PR "$PKG_BUILD/.install_pkg/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"/* "$ADDON_BUILD/$PKG_ADDON_ID/"
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   for p in           \