diff --git a/Makefile b/Makefile
index 3a18cafa3f..27ef62d460 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,10 @@ OPTFLAGS?=-DWITH_INOTIFY
 clibs=Utility/libdiskfree.o Utility/libmounts.o
 THREADFLAGS=$(shell if test -e  `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
 else
+ifeq ($(OS),Solaris)
+# Solaris is not supported by the assistant or watch command.
+FEATURES:=$(shell echo $(FEATURES) | sed -e 's/-DWITH_ASSISTANT//' -e 's/-DWITH_WEBAPP//')
+else
 # BSD system
 THREADFLAGS=-threaded
 OPTFLAGS?=-DWITH_KQUEUE
@@ -32,6 +36,7 @@ CFLAGS=-Wall -m32
 endif
 endif
 endif
+endif
 
 ALLFLAGS = $(BASEFLAGS) $(FEATURES) $(OPTFLAGS) $(THREADFLAGS)