diff --git a/CMakeLists.txt b/CMakeLists.txt
index 798f886..250a1cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,38 +9,46 @@ if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
 endif()
 
 project(MakePsmGreatAgain)
-include("${VITASDK}/share/vita.cmake" REQUIRED)
+include("$ENV{VITASDK}/share/vita.cmake" REQUIRED)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-q -Wall -O3 -std=gnu99")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions")
 
-include_directories(
-)
-
 link_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if (NOT ${RELEASE})
-  add_definitions(-DENABLE_LOGGING)
-endif()
-
-add_executable(MakePsmGreatAgain
-  MakePsmGreatAgain.c
+add_executable(${PROJECT_NAME}
+	MakePsmGreatAgain.c
 )
 
-target_link_libraries(MakePsmGreatAgain
-  taihen_stub
-  SceLibc_stub
-  SceAppMgr_stub
-  SceLibKernel_stub
-  SceIofilemgr_stub
+target_link_libraries(${PROJECT_NAME}
+        SceSysmemForDriver_stub
+		SceSysclibForDriver_stub
+		SceModulemgrForDriver_stub
+        SceThreadmgrForDriver_stub
+        SceIofilemgrForDriver_stub
+		SceUdcdForDriver_stub
+		SceSysrootForKernel_stub
+		SceUsbSerialForDriver_stub
+		SceDebugForDriver_stub
+        taihenForKernel_stub
+        gcc
 )
-
-set_target_properties(MakePsmGreatAgain
-  PROPERTIES LINK_FLAGS "-nostdlib"
-)
-
-vita_create_self(MakePsmGreatAgain.suprx MakePsmGreatAgain
+vita_create_self(${PROJECT_NAME}.skprx ${PROJECT_NAME}
+  UNSAFE
   CONFIG ${CMAKE_SOURCE_DIR}/exports.yml
-)
\ No newline at end of file
+)
+vita_create_stubs(${PROJECT_NAME}-stubs ${PROJECT_NAME} ${CMAKE_SOURCE_DIR}/exports.yml
+  KERNEL
+)
+
+install(DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-stubs/
+  DESTINATION lib
+  FILES_MATCHING PATTERN "*.a"
+)
+
+install(FILES savestates.h
+  DESTINATION include
+)