Index: sys/modules/luapmf/luapmf.c
===================================================================
RCS file: /cvsroot/src/sys/modules/luapmf/luapmf.c,v
retrieving revision 1.2
diff -u -d -r1.2 luapmf.c
--- sys/modules/luapmf/luapmf.c	29 Oct 2013 09:18:45 -0000	1.2
+++ sys/modules/luapmf/luapmf.c	9 Dec 2013 03:11:44 -0000
@@ -39,6 +39,7 @@
 #include <sys/reboot.h>
 
 #include <lua.h>
+#include <lauxlib.h>
 
 #ifdef _MODULE
 MODULE(MODULE_CLASS_MISC, luapmf, "lua");
@@ -80,29 +81,18 @@
 
 }
 
-struct pmf_reg {
-	const char *n;
-	int (*f)(lua_State *);
-};
-
 static int
 luaopen_pmf(void *ls)
 {
 	lua_State *L = (lua_State *)ls;
-	int n, nfunc;
-	struct pmf_reg pmf[] = {
+	const luaL_Reg pmf_lib[ ] = {
 		{ "system_shutdown",	system_shutdown },
 		{ "set_platform",	set_platform },
-		{ "get_platform",	get_platform }
+		{ "get_platform",	get_platform },
+		{ NULL, NULL }
 	};
 
-	nfunc = sizeof(pmf)/sizeof(pmf[1]);
-
-	lua_createtable(L, nfunc, 0);
-	for (n = 0; n < nfunc; n++) {
-		lua_pushcfunction(L, pmf[n].f);
-		lua_setfield(L, -2, pmf[n].n);
-	}
+	luaL_register(L, "pmf", pmf_lib);
 
 	/* some integer values */
 	lua_pushinteger(L, PMFE_DISPLAY_ON);
@@ -152,7 +142,6 @@
 	lua_pushinteger(L, RB_USERCONF);
 	lua_setfield(L, -2, "RB_USERCONF");
 
-	lua_setglobal(L, "pmf");
 	return 1;
 }
 
Index: sys/modules/luapmf/Makefile
===================================================================
RCS file: /cvsroot/src/sys/modules/luapmf/Makefile,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile
--- sys/modules/luapmf/Makefile	28 Oct 2013 20:06:05 -0000	1.1
+++ sys/modules/luapmf/Makefile	9 Dec 2013 03:11:44 -0000
@@ -6,6 +6,7 @@
 SRCS=		luapmf.c
 
 CPPFLAGS+=	-I${S}/../external/mit/lua/dist/src \
-		-I${S}/modules/lua
+		-I${S}/modules/lua \
+		-I${S}/sys
 
 .include <bsd.kmodule.mk>
