diff --git a/repos/base-pistachio/lib/mk/base-common.mk b/repos/base-pistachio/lib/mk/base-common.mk
index de836659d..c5ec1906c 100644
--- a/repos/base-pistachio/lib/mk/base-common.mk
+++ b/repos/base-pistachio/lib/mk/base-common.mk
@@ -4,7 +4,7 @@
 # \date   2013-02-14
 #
 
-LIBS += cxx startup
+LIBS += cxx startup syscall
 
 SRC_CC += cap_copy.cc
 SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
diff --git a/repos/base-pistachio/lib/mk/l4.mk b/repos/base-pistachio/lib/mk/l4.mk
deleted file mode 100644
index 564a78ced..000000000
--- a/repos/base-pistachio/lib/mk/l4.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Create symlink to Pistachio's user library
-#
-#
--include $(BUILD_BASE_DIR)/etc/pistachio.conf
-
-absdir = $(realpath $(shell find $(1) -maxdepth 0 -type d))
-PISTACHIO_USER_BUILD_ABS_DIR = $(call absdir,$(PISTACHIO_USER_BUILD_DIR))
-
-$(shell mkdir -p $(LIB_CACHE_DIR)/l4)
-$(shell ln -sf $(PISTACHIO_USER_BUILD_ABS_DIR)/lib/libl4.a $(LIB_CACHE_DIR)/l4/l4.lib.a)
diff --git a/repos/base-pistachio/lib/mk/syscall.mk b/repos/base-pistachio/lib/mk/syscall.mk
new file mode 100644
index 000000000..ebc5bf5e7
--- /dev/null
+++ b/repos/base-pistachio/lib/mk/syscall.mk
@@ -0,0 +1,7 @@
+PISTACHIO_USER_SRC := $(call select_from_ports,pistachio)/src/kernel/pistachio/user/lib/l4
+
+SRC_CC = debug.cc ia32.cc
+SRC_S  = ia32-syscall-stubs.S
+
+vpath %.cc $(PISTACHIO_USER_SRC)
+vpath %.S  $(PISTACHIO_USER_SRC)
diff --git a/repos/base-pistachio/mk/spec-pistachio.mk b/repos/base-pistachio/mk/spec-pistachio.mk
index 1b896972f..b333db033 100644
--- a/repos/base-pistachio/mk/spec-pistachio.mk
+++ b/repos/base-pistachio/mk/spec-pistachio.mk
@@ -22,12 +22,6 @@ INC_DIR += $(PISTACHIO_USER_BUILD_DIR)/include
 #
 REP_INC_DIR += include/pistachio
 
-#
-# Linker options
-#
-CXX_LINK_OPT += -L$(PISTACHIO_USER_BUILD_DIR)/lib
-EXT_OBJECTS  += -ll4
-
 clean_contrib:
 	$(VERBOSE)rm -rf $(BUILD_BASE_DIR)/l4