diff --git a/Makefile.unix b/Makefile.unix
index ec662a6944d..75aa2007fa7 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -226,6 +226,9 @@ USERLIBS  += lib/libproxies$(LIBEXT) lib/libuc$(LIBEXT) lib/libumm$(LIBEXT)
 USERLIBS  += lib/libuarch$(LIBEXT)
 else
 NUTTXLIBS += lib/libc$(LIBEXT) lib/libmm$(LIBEXT) lib/libarch$(LIBEXT)
+ifeq ($(CONFIG_LIB_SYSCALL),y)
+NUTTXLIBS += lib/libstubs$(LIBEXT) lib/libproxies$(LIBEXT)
+endif
 endif
 
 # Add libraries for C++ support.  CXX, CXXFLAGS, and COMPILEXX must
diff --git a/Makefile.win b/Makefile.win
index bc9cfcf5814..44c48e764f1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -219,6 +219,9 @@ USERLIBS  += lib\libproxies$(LIBEXT) lib\libuc$(LIBEXT) lib\libumm$(LIBEXT)
 USERLIBS  += lib\libuarch$(LIBEXT)
 else
 NUTTXLIBS += lib\libc$(LIBEXT) lib\libmm$(LIBEXT) lib\libarch$(LIBEXT)
+ifeq ($(CONFIG_LIB_SYSCALL),y)
+NUTTXLIBS += lib/libstubs$(LIBEXT) lib/libproxies$(LIBEXT)
+endif
 endif
 
 # Add libraries for C++ support.  CXX, CXXFLAGS, and COMPILEXX must