diff --git a/Makefile.defs b/Makefile.defs
index cbc3486e..ab25b1db 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -41,7 +41,9 @@ ifeq ($(OS),solaris)
         # For inet_aton.
         LDFLAGS += -lresolv
 
-	exclude_modules += adpcm gsm ilbc speex
+	# I don't have libspeex installed.
+	# binrpcctrl does some really weird header stuff that doesn't work.
+	exclude_modules += binrpcctrl ilbc speex
 else
 	GETARCH=uname -m
 endif
diff --git a/apps/Makefile b/apps/Makefile
index 7f4dae75..08228230 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -9,6 +9,11 @@ modules = $(filter-out $(exclude_modules) \
 		$(wildcard *) ) examples/tutorial/cc_acc
 #modules = wav gsm ilbc bot echo announcement recorder voicemail dtmf_demo ivr
 
+ifeq ($(OS),solaris)
+	# These don't build on Solaris because of missing Python, invalid make args, or other.
+	exclude_modules += py_sems py_comp pin_collect mailbox ivr diameter_client conf_auth
+endif
+
 .PHONY: all
 all: modules
 
diff --git a/core/compat/solaris.h b/core/compat/solaris.h
index a2fcc1b4..249a193e 100644
--- a/core/compat/solaris.h
+++ b/core/compat/solaris.h
@@ -57,4 +57,9 @@
 #define PF_LOCAL PF_UNIX
 #define MSG_NOSIGNAL 0
 
+// No u_int64_t on Solaris.
+#ifndef u_int64_t
+#define u_int64_t unsigned long long int
+#endif
+
 #endif