Index: .hgignore
==================================================================
--- .hgignore
+++ .hgignore
@@ -28,5 +28,7 @@
 ObjFW.xcodeproj/*.pbxuser
 src/objfw-defs.h
 src/ObjFW
 tests/tests
 tests/tests.exe
+tests/EBOOT.PBP
+tests/PARAM.SFO

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1,12 +1,13 @@
 AC_INIT(ObjFW, 0.4-dev, js@webkeks.org)
 AC_CONFIG_SRCDIR(src)
 
 AS_IF([test x"$host" = x"psp"], [
 	OBJCFLAGS="-G0 $OBJCFLAGS"
-	LIBS="$LIBS -lc -lpspkernel -lpspuser"
-	LIBS="$LIBS -lpspnet -lpspnet_inet -lpspnet_resolver"
+	LIBS="$LIBS -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lc"
+	LIBS="$LIBS -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver"
+	LIBS="$LIBS -lpsputility -lpspuser -lpspkernel"
 ])
 
 AC_CANONICAL_HOST
 
 AC_LANG([Objective C])

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -71,10 +71,16 @@
 		${IOS_USER}@${IOS_HOST}:${IOS_TMP}/
 	scp -q plugin/TestPlugin.impl ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/plugin/
 	echo "Signing and running tests binary on iOS device ${IOS_HOST}..."
 	ssh ${IOS_USER}@${IOS_HOST} 'cd ${IOS_TMP} && ldid -S tests && ./tests'
 
+EBOOT.PBP: ${PROG_NOINST}
+	psp-fixup-imports ${PROG_NOINST}
+	mksfo "ObjFW Tests" PARAM.SFO
+	psp-strip ${PROG_NOINST}
+	pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL
+
 include ../buildsys.mk
 
 CPPFLAGS += -I../src -I.. -DSTDOUT
 LIBS := -L../src -lobjfw ${LIBS}
 LD = ${OBJC}

Index: tests/TestsAppDelegate.m
==================================================================
--- tests/TestsAppDelegate.m
+++ tests/TestsAppDelegate.m
@@ -19,10 +19,15 @@
 #import "OFString.h"
 #import "OFFile.h"
 #import "OFAutoreleasePool.h"
 
 #import "TestsAppDelegate.h"
+
+#ifdef _PSP
+# include <pspmoduleinfo.h>
+PSP_MODULE_INFO("ObjFW Tests", 0, 0, 0);
+#endif
 
 OF_APPLICATION_DELEGATE(TestsAppDelegate)
 
 @implementation TestsAppDelegate
 - (void)outputString: (OFString*)str
@@ -42,11 +47,11 @@
 	}
 
 	[of_stdout writeString: str];
 	[of_stdout writeString: @"\033[m"];
 #else
-#error No output method!
+# error No output method!
 #endif
 }
 
 - (void)outputTesting: (OFString*)test
 	     inModule: (OFString*)module