Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -257,12 +257,12 @@
 LD = ${OBJC}
 FRAMEWORK_LIBS := -Fruntime				\
 		  ${RUNTIME_FRAMEWORK_LIBS}		\
 		  ${REEXPORT_RUNTIME_FRAMEWORK}		\
 		  ${LIBS}
+AMIGA_LIB_LIBS := -Lruntime -Lruntime/linklib -lobjfwrt.library.amigalib ${LIBS}
 LIBS := -Lruntime -Lruntime/linklib ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS}
-AMIGA_LIB_LIBS = ${LIBS}
 RCFLAGS = --use-temp-file						\
 	  -DOBJFW_LIB_MAJOR=${OBJFW_LIB_MAJOR}				\
 	  -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR}				\
 	  -DOBJFW_LIB_VERSION=\"${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}\" \
 	  -DOBJFW_SHARED_LIB=\"${OBJFW_SHARED_LIB}\"

Index: src/linklib/Makefile
==================================================================
--- src/linklib/Makefile
+++ src/linklib/Makefile
@@ -1,11 +1,12 @@
 include ../../extra.mk
 
 STATIC_LIB = libobjfw.library.a
+STATIC_AMIGA_LIB = libobjfw.library.amigalib.a
 SRCS = init.m		\
        linklib.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I.. -I../.. -I../exceptions -I../runtime	\
 	    -DOBJFW_AMIGA_LIB=\"${OBJFW_AMIGA_LIB}\"	\
 	    -DOBJFW_LIB_MINOR=${OBJFW_LIB_MINOR}

Index: src/runtime/linklib/Makefile
==================================================================
--- src/runtime/linklib/Makefile
+++ src/runtime/linklib/Makefile
@@ -1,12 +1,13 @@
 include ../../../extra.mk
 
 STATIC_LIB = libobjfwrt.library.a
+STATIC_AMIGA_LIB = libobjfwrt.library.amigalib.a
 SRCS = init.m		\
        linklib.m
 
 include ../../../buildsys.mk
 
 CPPFLAGS += -I.. -I../.. -I../../..				\
 	    -DOBJC_COMPILING_AMIGA_LINKLIB			\
 	    -DOBJFWRT_AMIGA_LIB=\"${OBJFWRT_AMIGA_LIB}\"	\
 	    -DOBJFWRT_LIB_MINOR=${OBJFWRT_LIB_MINOR}