diff --git a/Dockerfile b/Dockerfile
index 10873bd4..b84dcbce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,14 +13,14 @@ RUN cd /src && \
     make -j $(getconf _NPROCESSORS_ONLN) && \
     make -j $(getconf _NPROCESSORS_ONLN) install
 
-## gcc needs to include libcglue libpsputility libpsprtc libpspnet_inet libpspnet_resolver lpspsdk libpspuser libpspkernel
+## gcc needs to include libcglue libpsputility libpsprtc libpspnet_inet libpspnet_resolver libpspmodinfo libpspuser libpspkernel
 ## from pspsdk to be able to build executables, because they are part of the standard libraries
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libcglue.a" "$PSPDEV/psp/lib/libcglue.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsputility.a" "$PSPDEV/psp/lib/libpsputility.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpsprtc.a" "$PSPDEV/psp/lib/libpsprtc.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_inet.a" "$PSPDEV/psp/lib/libpspnet_inet.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspnet_resolver.a" "$PSPDEV/psp/lib/libpspnet_resolver.a" || { exit 1; }
-RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspsdk.a" "$PSPDEV/psp/lib/libpspsdk.a" || { exit 1; }
+RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspmodinfo.a" "$PSPDEV/psp/lib/libpspmodinfo.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspuser.a" "$PSPDEV/psp/lib/libpspuser.a" || { exit 1; }
 RUN ln -sf "$PSPDEV/psp/sdk/lib/libpspkernel.a" "$PSPDEV/psp/lib/libpspkernel.a" || { exit 1; }
 
diff --git a/configure.ac b/configure.ac
index 7c9a1b6b..abd1581d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ AC_CONFIG_FILES([Makefile
                  src/hprm/Makefile
                  src/kernel/Makefile
                  src/libcglue/Makefile
+                 src/modinfo/Makefile
                  src/mp3/Makefile
                  src/mpeg/Makefile
                  src/nand/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 72dcb608..fd4c7d69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ SUBDIRS = \
 	hprm \
 	kernel \
 	libcglue \
+	modinfo \
 	mp3 \
 	mpeg \
 	nand \
diff --git a/src/base/build.mak b/src/base/build.mak
index f4015603..1702bc02 100644
--- a/src/base/build.mak
+++ b/src/base/build.mak
@@ -63,9 +63,9 @@ endif
 LDFLAGS +=  -Wl,-zmax-page-size=128
 
 ifeq ($(USE_KERNEL_LIBS),1)
-LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspkernel
+LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspmodinfo -lpspsdk -lpspkernel
 else
-LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl \
+LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk \
 		-lpspnet -lpspnet_apctl
 endif
 
diff --git a/src/base/build_prx.mak b/src/base/build_prx.mak
index 05ed7a59..7e1a6194 100644
--- a/src/base/build_prx.mak
+++ b/src/base/build_prx.mak
@@ -31,9 +31,9 @@ ASFLAGS  := $(CFLAGS) $(ASFLAGS)
 LDFLAGS  := $(addprefix -L,$(LIBDIR)) -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx -nostartfiles -Wl,-zmax-page-size=128 $(LDFLAGS)
 
 ifeq ($(USE_KERNEL_LIBS),1)
-LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspkernel
+LIBS := -nostdlib $(LIBS) -lpspdebug -lpspdisplay_driver -lpspctrl_driver -lpspmodinfo -lpspsdk -lpspkernel
 else 
-LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl
+LIBS := $(LIBS) -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk
 endif
 
 ifeq ($(PSP_FW_VERSION),)
diff --git a/src/modinfo/Makefile.am b/src/modinfo/Makefile.am
new file mode 100644
index 00000000..3e2f6507
--- /dev/null
+++ b/src/modinfo/Makefile.am
@@ -0,0 +1,14 @@
+libdir := @PSPSDK_LIBDIR@
+
+CC = @PSP_CC@
+CCAS = $(CC)
+AR = @PSP_AR@
+RANLIB = @PSP_RANLIB@
+
+CPPFLAGS =
+CFLAGS = @PSPSDK_CFLAGS@
+CCASFLAGS = $(CFLAGS)
+
+lib_LIBRARIES = libpspmodinfo.a
+libpspmodinfo_a_SOURCES = \
+	modinfo.S
\ No newline at end of file
diff --git a/src/sdk/modinfo.S b/src/modinfo/modinfo.S
similarity index 100%
rename from src/sdk/modinfo.S
rename to src/modinfo/modinfo.S
diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
index e3b04bf3..7ca8b245 100644
--- a/src/sdk/Makefile.am
+++ b/src/sdk/Makefile.am
@@ -31,7 +31,7 @@ INETHELPER_OBJS = pspSdkLoadInetModules.o pspSdkInetInit.o pspSdkInetTerm.o
 MULT_SRCS = modulemgr_patches.c inethelper.c
 MULT_OBJS = $(MODULEMGR_PATCHES_OBJS) $(INETHELPER_OBJS)
 
-libpspsdk_a_SOURCES = query_mod.c loadmodule.c fixup.c threadutils.c interrupt.S k1set.S modinfo.S fpu.S $(MULT_SRCS)
+libpspsdk_a_SOURCES = query_mod.c loadmodule.c fixup.c threadutils.c interrupt.S k1set.S fpu.S $(MULT_SRCS)
 libpspsdk_a_LIBADD  = $(MULT_OBJS)
 
 $(MODULEMGR_PATCHES_OBJS): modulemgr_patches.c