diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 8a76e09676..3b205a6256 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -598,10 +598,12 @@ tup.append_table(img_files, {
  {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"},
 })
 tup.append_table(extra_files, {
- {"kolibrios/drivers/DRVINST.KEX", PROGS .. "/cmm/drvinst/drvinst.com"},
+ {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"},
+ {"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pig.com"},
  {"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"},
- {"kolibrios/utils/DICTY.KEX", PROGS .. "/cmm/dicty/dicty.com"},
+ {"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"},
  {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
+ {"kolibrios/utils/netcheck", PROGS .. "/cmm/examples/netcheck.com"},
 })
 end -- tup.getconfig('NO_CMM') ~= 'full'
 
diff --git a/data/common/games/pig/font.png b/data/common/games/pig/font.png
deleted file mode 100644
index a729f9fd78..0000000000
Binary files a/data/common/games/pig/font.png and /dev/null differ
diff --git a/data/common/games/pig/glasfont.png b/data/common/games/pig/glasfont.png
deleted file mode 100644
index 6650824a19..0000000000
Binary files a/data/common/games/pig/glasfont.png and /dev/null differ
diff --git a/data/common/games/pig/icons.png b/data/common/games/pig/icons.png
deleted file mode 100644
index ee1d07b1b2..0000000000
Binary files a/data/common/games/pig/icons.png and /dev/null differ
diff --git a/data/common/games/pig/lifepig.png b/data/common/games/pig/lifepig.png
deleted file mode 100644
index 9aa42d72ba..0000000000
Binary files a/data/common/games/pig/lifepig.png and /dev/null differ
diff --git a/data/common/games/pig/pig b/data/common/games/pig/pig
deleted file mode 100644
index 25d2c40abc..0000000000
Binary files a/data/common/games/pig/pig and /dev/null differ
diff --git a/data/common/games/pig/pig.zip b/data/common/games/pig/pig.zip
new file mode 100644
index 0000000000..061148533a
Binary files /dev/null and b/data/common/games/pig/pig.zip differ
diff --git a/data/common/games/pig/pigframe.png b/data/common/games/pig/pigframe.png
deleted file mode 100644
index d695c831a5..0000000000
Binary files a/data/common/games/pig/pigframe.png and /dev/null differ
diff --git a/data/common/games/pig/slime.png b/data/common/games/pig/slime.png
deleted file mode 100644
index 93bfb41edc..0000000000
Binary files a/data/common/games/pig/slime.png and /dev/null differ
diff --git a/data/common/games/pig/stars.png b/data/common/games/pig/stars.png
deleted file mode 100644
index c31540afeb..0000000000
Binary files a/data/common/games/pig/stars.png and /dev/null differ
diff --git a/data/common/games/pig/tiles.png b/data/common/games/pig/tiles.png
deleted file mode 100644
index a7b62d03ec..0000000000
Binary files a/data/common/games/pig/tiles.png and /dev/null differ
diff --git a/data/common/settings/games.ini b/data/common/settings/games.ini
index f56d4bf74d..29731e52b2 100644
--- a/data/common/settings/games.ini
+++ b/data/common/settings/games.ini
@@ -32,7 +32,7 @@ Sea War=games/SW,66
 Almaz=/k/games/almaz,81
 Tanks=games/tanks,67
 RocketForces=games/rforces,110
-; Pig=/k/games/pig/pig  ;doesn't work from CD
+Pig=/k/games/pig/pigex
 ; Ataka=games/ataka  ;rus only
 Donkey=/k/games/donkey
 Loderunner=/k/games/LRL/LRL,41
diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini
index bb472bb833..1b212d6781 100644
--- a/data/rus/settings/games.ini
+++ b/data/rus/settings/games.ini
@@ -32,7 +32,7 @@ Sea War=games/SW,66
 Almaz=/k/games/almaz,81
 Tanks=games/tanks,67
 RocketForces=games/rforces,110
-; Pig=/k/games/pig/pig  ;doesn't work from CD
+Pig=/k/games/pig/pigex
 Ataka=games/ataka  ;rus only
 Donkey=/k/games/donkey
 Loderunner=/k/games/LRL/LRL,41
diff --git a/programs/cmm/examples/Tupfile.lua b/programs/cmm/examples/Tupfile.lua
index 2ee5586d22..23a45733c4 100644
--- a/programs/cmm/examples/Tupfile.lua
+++ b/programs/cmm/examples/Tupfile.lua
@@ -9,5 +9,5 @@ tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CM
 tup.rule("rgb.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com")
 tup.rule("console.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com")
 tup.rule("info.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "info.com")
-tup.rule("pig.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pig.com")
+tup.rule("pigex.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com")
 tup.rule("netcheck.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "netcheck.com")
diff --git a/programs/cmm/examples/pig.c b/programs/cmm/examples/pig.c
deleted file mode 100644
index 24c616d1c0..0000000000
--- a/programs/cmm/examples/pig.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Template C-- program.
-*/
-
-#define MEMSIZE 4096*5
-
-#include "../lib/kolibri.h"
-#include "../lib/fs.h"
-#include "../lib/patterns/restart_process.h"
-
-proc_info Form;
-
-void main()
-{
-	int i;
-	CreateDir("/tmp0/1/pig");
-	RunProgram("/sys/UNZ", "-o /tmp0/1/pig -h /kolibrios/games/pig.zip");
-	for (i = 0; i < 200; i++)
-	{
-		if (CheckProcessExists("UNZ")==false) break;
-		pause(3);
-	}
-	RunProgram("/tmp0/1/pig/pig", NULL);
-}
-
diff --git a/programs/cmm/examples/pigex.c b/programs/cmm/examples/pigex.c
new file mode 100644
index 0000000000..14c2b6c6ce
--- /dev/null
+++ b/programs/cmm/examples/pigex.c
@@ -0,0 +1,27 @@
+/*
+ * PIGEX - PIG Game extractor
+ * We need this app because PIG can not be run from CD-drive
+*/
+
+#define MEMSIZE 4096*5
+
+#include "../lib/kolibri.h"
+#include "../lib/fs.h"
+#include "../lib/patterns/restart_process.h"
+
+void main()
+{
+	int i;
+
+	if (! file_exists("/tmp0/1/pig/pig")) {
+		RunProgram("/sys/UNZ", "-o \"/tmp0/1\" -h \"/kolibrios/games/pig/pig.zip\"");
+		for (i = 0; i < 200; i++)
+		{
+			if (CheckProcessExists("UNZ")==false) break;
+			pause(3);
+		}		
+	}
+
+	RunProgram("/tmp0/1/pig/pig", NULL);
+}
+