diff --git a/lua-rfsm/Makefile b/lua-rfsm/Makefile
index 469f5fad7fb809fec6a0e19f36736d591154b1d2..3fadc2375597023d3b330e35de6567ccb7914ab7 100644
--- a/lua-rfsm/Makefile
+++ b/lua-rfsm/Makefile
@@ -8,10 +8,11 @@ DISTNAME= 		lua-rfsm-${PKG_VERSION}
 CATEGORIES=		supervision
 MASTER_SITES=	https://github.com/kmarkus/rFSM.git@${COMMIT}
 FETCH_METHOD=	git
+PKGREVISION= 	1
 
 MAINTAINER=		arnaud.degroote@isae.fr
 COMMENT=		rFSM is a reduced (lightweight) Statechart implementation written in pure Lua.
-LICENSE=		gnu-lgpl-v2
+LICENSE=		gnu-lgpl-v3
 
 NO_CONFIGURE=	yes
 NO_BUILD=		yes
@@ -20,10 +21,12 @@ include ../../mk/sysdep/lua.mk
 include ../../mk/robotpkg.mk
 
 do-install:
+	install -d ${PREFIX}/bin
 	install -d ${PREFIX}/lib/lua/rfsm
 	install -d ${PREFIX}/share/doc/rfsm
 	install -d ${PREFIX}/share/rfsm/examples
 
+	cd ${WRKSRC}/tools && ${PAX} -rwp ma rfsm* ${PREFIX}/bin
 	cd ${WRKSRC} && ${PAX} -rwp ma *.lua ${PREFIX}/lib/lua/rfsm
 	cd ${WRKSRC}/doc && ${PAX} -rwp ma . ${PREFIX}/share/doc/rfsm
 	cd ${WRKSRC}/examples && ${PAX} -rwp ma . ${PREFIX}/share/rfsm/examples
diff --git a/lua-rfsm/PLIST b/lua-rfsm/PLIST
index eafd88639f1861a8c5551297aaad8773fc1e9316..f31eca9f8660067f3200b9d0527d8e08ffcf4da5 100644
--- a/lua-rfsm/PLIST
+++ b/lua-rfsm/PLIST
@@ -1,4 +1,8 @@
-@comment Thu Dec 12 14:14:41 CET 2013
+@comment Thu Dec 12 15:16:05 CET 2013
+bin/rfsm-sim
+bin/rfsm-sim.lua
+bin/rfsm-viz
+bin/rfsm2json
 lib/lua/rfsm/ansicolors.lua
 lib/lua/rfsm/rfsm.lua
 lib/lua/rfsm/rfsm2json.lua
@@ -54,6 +58,3 @@ share/rfsm/examples/simple_doo_idle.lua
 share/rfsm/examples/simple_idle_doo.lua
 share/rfsm/examples/timeevent.lua
 share/rfsm/examples/total_failure.lua
-@pkgdir share/doc/liborocos-rtt/xml/images/icons/hires
-@pkgdir share/doc/liborocos-rtt/xml/images/hires
-@pkgdir share/doc/liborocos-rtt/api/html