diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ecd8f21..802e75c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -677,15 +677,23 @@ if(VITA)
   target_link_libraries(lego1 PRIVATE GLESv2)
 
   set(ISLE_PACKAGE_NAME "vita-isle")
-  set(VITA_APP_NAME "Hello World")
-  set(VITA_TITLEID  "VSDK00006")
+  set(VITA_APP_NAME "Lego Island")
+  set(VITA_TITLEID  "LEGO00001")
   set(VITA_VERSION  "01.00")
   
   vita_create_self(isle.self isle)
 
+  set(VPK_FILE_ARGS)
+  get_target_property(gles_modules GLESv2 MODULES)
+  foreach(file IN LISTS gles_modules)
+    get_filename_component(fname ${file} NAME)
+    list(APPEND VPK_FILE_ARGS FILE ${file} module/${fname})
+  endforeach()
+
   vita_create_vpk(isle.vpk ${VITA_TITLEID} isle.self
     VERSION ${VITA_VERSION}
     NAME ${VITA_APP_NAME}
+    ${VPK_FILE_ARGS}
   )
 endif()
 if(MSVC)
diff --git a/cmake/modules/pvr_psp2.cmake b/cmake/modules/pvr_psp2.cmake
index 0a52d6bc..0ae9e6f9 100644
--- a/cmake/modules/pvr_psp2.cmake
+++ b/cmake/modules/pvr_psp2.cmake
@@ -51,3 +51,6 @@ target_link_libraries(GLESv2 INTERFACE
   libgpu_es4_ext_stub_weak
   libIMGEGL_stub_weak
 )
+set_target_properties(GLESv2 PROPERTIES
+  MODULES "${PVR_PSP2_BINARY_DIR}/extracted/libGLESv2.suprx;${PVR_PSP2_BINARY_DIR}/extracted/libIMGEGL.suprx;${PVR_PSP2_BINARY_DIR}/extracted/libgpu_es4_ext.suprx"
+)