diff --git a/engine/wscript b/engine/wscript
index 23490ac0..e574ad17 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -239,6 +239,8 @@ def build(bld):
 			nacp = 'platform/nswitch/xash3d-fwgs.nacp',
 			icon = 'platform/nswitch/icon.jpg',
 			sce_sys = 'platform/psvita/sce_sys',
+			title_id = 'XASH10000',
+			app_name = 'xash3d-fwgs'
 		)
 	else:
 		if bld.env.SINGLE_BINARY:
diff --git a/scripts/waifulib/psvita.py b/scripts/waifulib/psvita.py
index a459e9c9..68e7af18 100644
--- a/scripts/waifulib/psvita.py
+++ b/scripts/waifulib/psvita.py
@@ -83,10 +83,14 @@ def apply_fself(self):
 def apply_sfo(self):
 	fselffile = self.fself_task.outputs[0]
 	in_nodes = [fselffile]
+	scetitleid = getattr(self, 'title_id', None)
+	sceappname = getattr(self, 'app_name', None)
 
 	sfofile = fselffile.change_ext('.sfo')
 	out_nodes = [sfofile]
 
+	if scetitleid: self.env.TITLEID = scetitleid
+	if sceappname: self.env.APPNAME = sceappname
 	self.env.SFOFILE = str(sfofile)
 
 	self.sfo_task = self.create_task('mksfoex', in_nodes)
diff --git a/wscript b/wscript
index 985716cf..7b9f45dc 100644
--- a/wscript
+++ b/wscript
@@ -273,9 +273,6 @@ def configure(conf):
 		conf.env.append_unique('CXXFLAGS_cxxshlib', ['-fPIC', '-fno-use-cxa-atexit'])
 		conf.env.append_unique('LINKFLAGS_cshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all'])
 		conf.env.append_unique('LINKFLAGS_cxxshlib', ['-nostdlib', '-Wl,--unresolved-symbols=ignore-all'])
-		# set the metadata
-		conf.env.TITLEID = 'XASH10000'
-		conf.env.APPNAME = 'xash3d-fwgs'
 
 	# And here C++ flags starts to be treated separately
 	cxxflags = list(cflags)