diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h
index 67994bb3ca..639f336b5b 100644
--- a/apps/plugins/lua/rockconf.h
+++ b/apps/plugins/lua/rockconf.h
@@ -29,7 +29,7 @@
 #undef luai_jmpbuf
 
 #undef LUA_PATH_DEFAULT
-#define LUA_PATH_DEFAULT  "$/?.lua;" VIEWERS_DIR"/?.lua;"
+#define LUA_PATH_DEFAULT  "$/?.lua;" "$/?/init.lua;" VIEWERS_DIR"/lua/?.lua;" VIEWERS_DIR"/lua/?/init.lua;"
 
 #ifndef SIMULATOR
 #include "../../codecs/lib/setjmp.h"
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index d21fd8e557..a3ac75fa30 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -429,7 +429,8 @@ STOP
     glob_copy('apps/lang/*lng', "$rbdir/langs/");
 
     # copy the .lua files
-    glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/");
+    mkdir "$rbdir/rocks/viewers/lua/", 0777;
+    glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/lua/");
 }
 
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =