diff --git a/acinclude.m4 b/acinclude.m4
index 06da314aa..64b818662 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -279,7 +279,7 @@ TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games
 TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
 	[--with-libdir=PATH], [where to find internal libs])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, datadir, /share, /tuxbox/neutrino/plugins,
 	[--with-plugindir=PATH], [where to find plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
@@ -288,7 +288,7 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tu
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
 	[--with-plugindir_mnt=PATH], [where to find external plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
 	[--with-luaplugindir=PATH], [where to find Lua plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
diff --git a/src/system/luaserver.cpp b/src/system/luaserver.cpp
index 8232b5268..53069a69b 100644
--- a/src/system/luaserver.cpp
+++ b/src/system/luaserver.cpp
@@ -21,7 +21,7 @@
 #if 0
 For testing try:
 
-cat <<EOT > /lib/tuxbox/luaplugins/test.lua
+cat <<EOT > /share/tuxbox/neutrino/luaplugins/test.lua
 #!/bin/luaclient
 
 for i,v in ipairs(arg) do
@@ -30,9 +30,9 @@ end
 return "ok"
 EOT
 
-chmod +x /lib/tuxbox/luaplugins/test.lua
+chmod +x /share/tuxbox/neutrino/luaplugins/test.lua
 
-/lib/tuxbox/luaplugins/test.lua a b c d
+/share/tuxbox/neutrino/luaplugins/test.lua a b c d
 #endif
 
 #include <config.h>