diff --git a/group/bld.inf b/group/bld.inf
index 6f421bc..bcb0a2f 100644
--- a/group/bld.inf
+++ b/group/bld.inf
@@ -3,7 +3,7 @@ DEFAULT ARMV6
 
 PRJ_MMPFILES
 gnumakefile shaders.mk
-//librw_gles2.mmp
-//re3_gles2.mmp
+librw_gles2.mmp
+re3_gles2.mmp
 librw_gles1.mmp
 re3_gles1.mmp
diff --git a/group/re3.mmh b/group/re3.mmh
index 200c71a..d7376d6 100644
--- a/group/re3.mmh
+++ b/group/re3.mmh
@@ -13,6 +13,9 @@ LIBRARY eikcore.lib
 LIBRARY avkon.lib
 LIBRARY ws32.lib
 LIBRARY hal.lib
+LIBRARY featdiscovery.lib
+LIBRARY mediaclientaudiostream.lib
+LIBRARY mediaclientaudio.lib
 
 EPOCSTACKSIZE 0x14000
 EPOCHEAPSIZE 0x80000 0x4000000
diff --git a/group/re3_gles1.mmp b/group/re3_gles1.mmp
index 690f1b2..79ed835 100644
--- a/group/re3_gles1.mmp
+++ b/group/re3_gles1.mmp
@@ -1,7 +1,7 @@
 #undef SYMBIAN_3
 #define S60V3
 //TARGET re3_gles1.exe
-TARGET re3.exe
+TARGET re3_gles1.exe
 LIBRARY libstdcpp.lib
 LIBRARY libgles_cm.lib
 STATICLIBRARY librw_gles1.lib
diff --git a/group/re3_gles2.mmp b/group/re3_gles2.mmp
index 258d08b..b440269 100644
--- a/group/re3_gles2.mmp
+++ b/group/re3_gles2.mmp
@@ -1,6 +1,6 @@
 #undef S60V3
 #define SYMBIAN_3
-TARGET re3_gles2.exe
+TARGET re3.exe
 LIBRARY libstdcppv5.lib
 LIBRARY libglesv2.lib
 LIBRARY libegl.lib
diff --git a/sis/re3.pkg b/sis/re3.pkg
index 62cc2e5..1c9097c 100644
--- a/sis/re3.pkg
+++ b/sis/re3.pkg
@@ -7,16 +7,16 @@
 %{"nnproject"}
 :"nnproject"
 
-;IF (NOT package(0x20009A80)) OR (NOT package(0x2002372A)) ; old or missing openc
-;    "incompatible_openc.txt"-"", FT, FORCEABORT
-;ENDIF
+IF (NOT package(0x20009A80)) OR (NOT package(0x2002372A)) ; old or missing openc
+    "incompatible_openc.txt"-"", FT, FORCEABORT
+ENDIF
 
-;IF exists("z:\system\install\Series60v5.2.sis") AND exists("z:\sys\bin\libGLESv2.dll")
-;    "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3_gles2.exe"-"!:\sys\bin\re3.exe"
-;ELSE
-;    "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3_gles1.exe"-"!:\sys\bin\re3.exe"
-;ENDIF
-"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3.exe"-"!:\sys\bin\re3.exe"
+IF exists("z:\system\install\Series60v5.2.sis") AND exists("z:\sys\bin\libGLESv2.dll")
+    "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3.exe"-"!:\sys\bin\re3.exe"
+ELSE
+    "$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3_gles1.exe"-"!:\sys\bin\re3.exe"
+ENDIF
+;"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\re3.exe"-"!:\sys\bin\re3.exe"
 "$(EPOCROOT)\epoc32\data\z\private\10003a3f\import\apps\re3_reg.rsc" - "!:\private\10003a3f\import\apps\re3_reg.rsc"
 "$(EPOCROOT)\epoc32\data\z\resource\apps\re3.rsc" - "!:\resource\apps\re3.rsc"
 "$(EPOCROOT)\epoc32\data\z\resource\apps\re3_icon.mif" - "!:\resource\apps\re3_icon.mif"