diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
index 92272d2276..09f28676d3 100644
--- a/Common/FileUtil.cpp
+++ b/Common/FileUtil.cpp
@@ -42,9 +42,8 @@
 #include <stdlib.h>
 #endif
 
-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
 #include <sys/sysctl.h>		// KERN_PROC_PATHNAME
-#include <unistd.h>		// getpid
 #endif
 
 #if defined(__APPLE__)
@@ -767,9 +766,15 @@ const std::string &GetExeDirectory()
 #elif defined(KERN_PROC_PATHNAME)
 		int mib[4] = {
 			CTL_KERN,
+#if defined(__NetBSD__)
+			KERN_PROC_ARGS,
+			-1,
+			KERN_PROC_PATHNAME,
+#else
 			KERN_PROC,
 			KERN_PROC_PATHNAME,
-			getpid()
+			-1,
+#endif
 		};
 		size_t sz = program_path_size;
 
diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index 34bbad7d4f..8f1fd199a9 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -269,6 +269,8 @@ namespace Reporting
 		return "DragonFly";
 #elif defined(__FreeBSD__)
 		return "FreeBSD";
+#elif defined(__FreeBSD_kernel__) && defined(__GLIBC__)
+		return "GNU/kFreeBSD";
 #elif defined(__NetBSD__)
 		return "NetBSD";
 #elif defined(__OpenBSD__)