diff --git a/Makefile b/Makefile
index 0141bef55d46fcdddaf46bf4885e0c1e16eec421..f8400b048bd70e142d16c4c910bfc9bd6c096046 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ CONFIG_SERPROG = yes
 ifeq ($(CONFIG_SERPROG), yes)
 FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1'
 OBJS += serprog.o
+ifeq ($(OS_ARCH), SunOS)
+LIBS += -lsocket
+endif
 endif
 
 FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
diff --git a/README b/README
index 9f21c219af0081a865e5f59f990f6258dc927702..070acffba805fc45c6a3494fa09dbcdd8804d7eb 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ Linux et al:
 
  * pciutils
  * pciutils-devel / pciutils-dev / libpci-dev
- * zlib-devel / zlib1g-dev
+ * zlib-devel / zlib1g-dev (only needed if libpci is static)
 
 On FreeBSD, you need the following ports:
 
@@ -58,15 +58,18 @@ To compile on FreeBSD, use:
 
  gmake
 
+To compile on Nexenta, use:
+
+ make
+
 To compile on Solaris, use:
 
- gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \
-       CFLAGS=-O2
+ gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2
 
 To compile on DragonFly BSD, use:
 
  ln -s /usr/pkg/include/pciutils pci
- gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz"
+ gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib"
 
 To compile and run on Darwin/Mac OS X: