diff --git a/TODO b/TODO
index bcfdfef8..33f66f90 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,8 @@ Testing
 		Ubuntu Lucid amd64
 		CentOS 3.9 i386 (FUSE 2.5)
 		FreeBSD 9.0 amd64
+	Known bad
+		Solaris 11 - No fuse_lowlevel
 	Todo
 		NetBSD 6 with libperfuse
 		Solaris 11? OpenIndiana?
diff --git a/configure.ac b/configure.ac
index 944ce4a0..78498526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_DEFUN([SQ_NONSTD_DEFINE],[
 	AS_VAR_PUSHDEF([sq_cache],[sq_cv_decl_nonstd_$1])
 	AC_CACHE_VAL([sq_cache],[
 		AS_VAR_SET([sq_cache],[no])
-		for def in none _DARWIN_C_SOURCE _XOPEN_SOURCE _BSD_SOURCE _GNU_SOURCE _POSIX_C_SOURCE
+		for def in none _DARWIN_C_SOURCE _NETBSD_SOURCE _XOPEN_SOURCE _BSD_SOURCE _GNU_SOURCE _POSIX_C_SOURCE
 		do
 			AS_IF([test "x$def" = "x_POSIX_C_SOURCE"],[op=undef],[op=define])
 			AS_IF([test "x$def" = "x_XOPEN_SOURCE"],[val=500],[val=1])
@@ -90,7 +90,7 @@ SQ_NONSTD_DEFINE(makedev,[
 	#endif
 ],[makedev(0,0)])
 SQ_NONSTD_DEFINE(pread,[#include <unistd.h>],[(void)pread;])
-SQ_NONSTD_DEFINE(S_IFDIR,[#include <sys/stat.h>],[mode_t m = S_IFDIR;])
+SQ_NONSTD_DEFINE(S_IFSOCK,[#include <sys/stat.h>],[mode_t m = S_IFSOCK;])
 SQ_NONSTD_DEFINE(ENOATTR,[
 	#ifdef HAVE_ATTR_XATTR_H
 		#include <sys/types.h>
diff --git a/nonstd-internal.h b/nonstd-internal.h
index 27e86503..7314b236 100644
--- a/nonstd-internal.h
+++ b/nonstd-internal.h
@@ -27,9 +27,12 @@
 #define CHANGE_BSD_SOURCE 3
 #define CHANGE_GNU_SOURCE 4
 #define CHANGE_POSIX_C_SOURCE 5
+#define CHANGE_NETBSD_SOURCE 6
 
 #if SQFEATURE == CHANGE_XOPEN_SOURCE
 	#define _XOPEN_SOURCE 500
+#elif SQFEATURE == CHANGE_NETBSD_SOURCE
+	#define _NETBSD_SOURCE
 #elif SQFEATURE == CHANGE_DARWIN_C_SOURCE
 	#define _DARWIN_C_SOURCE
 #elif SQFEATURE == CHANGE_BSD_SOURCE
diff --git a/nonstd-stat.c b/nonstd-stat.c
index 2ee8f5b2..ab0e195a 100644
--- a/nonstd-stat.c
+++ b/nonstd-stat.c
@@ -24,7 +24,7 @@
  */
 #include "config.h"
 
-#define SQFEATURE NONSTD_S_IFDIR_DEF
+#define SQFEATURE NONSTD_S_IFSOCK_DEF
 #include "nonstd-internal.h"
 
 #include <sys/stat.h>