Index: ipk/make-ipk
===================================================================
--- ipk/make-ipk	(revision 17598)
+++ ipk/make-ipk	(revision 17599)
@@ -200,4 +200,12 @@
 	cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/tmc/* "$HOMEDIR"/BUILD/titanplayers_tmc/var/usr/local/share/titan/plugins/tmc
 
+	cp -a "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/swap/titanplugins/hbbtv/* "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv
+	cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/hbbtv/* "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv
+	cp -a $HOME/flashimg/BUILD/titan/usr/lib/* "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera
+	rm -rf "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera/directfb-1.4-5
+ 	ln -s /var/usr/lib/directfb-1.4-5 "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera/directfb-1.4-5
+	#remove for release
+#	rm -rf "$HOMEDIR"/BUILD/titanplayers_hbbtv 
+
 	# titantools
 	cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/keylock/* "$HOMEDIR"/BUILD/titantools_keylock/var/usr/local/share/titan/plugins/keylock
@@ -249,15 +257,4 @@
 	#remove for release
 #	rm -rf "$HOMEDIR"/BUILD/titanswapplayers_hbbtv 
-
-	# titanplayers
-	cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/hbbtv/* "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv
-	cp -a $HOME/flashimg/BUILD/titan/usr/lib/* "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera
-#	mkdir -p "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/usr/local/share/titan/plugins
-# 	ln -s /var/swap/titanplugins/hbbtv "$HOMEDIR"/BUILD/titanswapplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv
-	rm -rf "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera/directfb-1.4-5
- 	ln -s /var/usr/lib/directfb-1.4-5 "$HOMEDIR"/BUILD/titanplayers_hbbtv/var/usr/local/share/titan/plugins/hbbtv/opera/directfb-1.4-5
-	#remove for release
-#	rm -rf "$HOMEDIR"/BUILD/titanplayers_hbbtv 
-
 
 	cp -a $HOME/flashimg/BUILD/titan/var/usr/local/share/titan/plugins/gmediarender/* "$HOMEDIR"/BUILD/titanswapplayers_gmediarender/var/swap/titanplugins/gmediarender