diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2e2f92fadf..f38cd29940 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -13,6 +13,7 @@
 #include <sstream>
 #include <algorithm>
 
+#include <limits.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 2dddce740d..40cb25dc5f 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -10,6 +10,10 @@ libstore_LIBS = libutil libformat
 
 libstore_LDFLAGS = -lsqlite3 -lbz2
 
+ifeq ($(OS), SunOS)
+	libstore_LDFLAGS += -lsocket
+endif
+
 libstore_CXXFLAGS = \
  -DNIX_STORE_DIR=\"$(storedir)\" \
  -DNIX_DATA_DIR=\"$(datadir)\" \
diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk
index db071a3f7c..bab84e7add 100644
--- a/src/nix-daemon/local.mk
+++ b/src/nix-daemon/local.mk
@@ -6,4 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
 
 nix-daemon_LIBS = libmain libstore libutil libformat
 
+ifeq ($(OS), SunOS)
+        nix-daemon_LDFLAGS += -lsocket
+endif
+
 $(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker))