diff --git a/scripts/create_addon b/scripts/create_addon
index 09f341897d..15ca3de1e2 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -44,11 +44,27 @@ $SCRIPTS/build $@
 printf  "%${BUILD_INDENT}c CREATE ADDON  $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-if [ -f $PKG_DIR/addon ]; then
+if [ -f $PKG_DIR/package.mk ]; then
+  # unset functions
+  unset -f addon
 
+  # include buildfile
+  . $PKG_DIR/package.mk
+elif [ -f $PKG_DIR/meta ] ; then
+  # include buildfile
+  . $PKG_DIR/meta
+fi
+
+if [ "$PKG_IS_ADDON" = "yes" ] ; then
   rm -rf $ADDON_BUILD
 
-  $PKG_DIR/addon $@ >&$VERBOSE_OUT
+  if [ "$(type -t addon)" = "function" ]; then
+    addon
+  fi
+
+  if [ -f $PKG_DIR/addon ]; then
+    $PKG_DIR/addon $@ >&$VERBOSE_OUT
+  fi
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
     if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then