diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition
index 7b00a6b4..f38423ec 100755
--- a/FunKey/board/funkey/update_partition
+++ b/FunKey/board/funkey/update_partition
@@ -61,6 +61,7 @@ do_postinst()
     rm /mnt/Emulators/ps1_pcsx_funkey-s.opk
     rm /mnt/Emulators/snes_pocketsnes_funkey-s.opk
     rm /mnt/Emulators/wonderswan_mednafen_funkey-s.opk
+    rm /mnt/Applications/commander-funkey-s.opk
 
     # Unmount Rootfs
     umount ${root_mount}
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
index 035d4497..b6257052 100644
--- a/FunKey/package/commander/commander.mk
+++ b/FunKey/package/commander/commander.mk
@@ -3,9 +3,9 @@
 # commander
 #
 #############################################################
-COMMANDER_VERSION = commander-FunKey-1.1.1
+COMMANDER_VERSION = commander-FunKey-1.1.2
 COMMANDER_SITE_METHOD = git
-COMMANDER_SITE = https://github.com/FunKey-Project/commander.git
+COMMANDER_SITE = https://github.com/DrUm78/commander.git
 COMMANDER_LICENSE = GPL-2.0
 
 COMMANDER_DEPENDENCIES = sdl sdl_ttf sdl_gfx
@@ -20,9 +20,10 @@ define COMMANDER_CREATE_OPK
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Applications
 	cd $(@D); \
 	$(HOST_DIR)/usr/bin/mksquashfs \
-		opkg/default.funkey-s.desktop \
+		opkg/commander.funkey-s.desktop \
 		opkg/readme.funkey-s.txt \
 		opkg/commander.png \
+		opkg/commander.sh \
 		res/file-image.png \
 		res/file-ipk.png \
 		res/file-is-symlink.png \
@@ -32,8 +33,9 @@ define COMMANDER_CREATE_OPK
 		res/DroidSansFallback.ttf \
 		res/Fiery_Turk.ttf \
 		res/FreeSans.ttf \
+		res/libSDL-1.2.so.0.11.4 \
 		$(TARGET_DIR)/usr/bin/commander \
-		$(TARGET_DIR)/usr/local/share/OPKs/Applications/commander-funkey-s.opk \
+		$(TARGET_DIR)/usr/local/share/OPKs/Applications/commander_funkey-s.opk \
 		-all-root -noappend -no-exports -no-xattrs -noappend; \
 	rm -rf $(TARGET_DIR)/usr/bin/commander
 endef