diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
index 13363beb1..33060873c 100644
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
@@ -65,7 +65,7 @@
 #define POCO_OS_VMS           0x2001
 
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	#define POCO_OS_FAMILY_UNIX 1
 	#define POCO_OS_FAMILY_BSD 1
 	#define POCO_OS POCO_OS_FREE_BSD
diff --git a/Foundation/src/NamedEvent_UNIX.cpp b/Foundation/src/NamedEvent_UNIX.cpp
index 7c0cd5898..1ceaf0e2d 100644
--- a/Foundation/src/NamedEvent_UNIX.cpp
+++ b/Foundation/src/NamedEvent_UNIX.cpp
@@ -52,7 +52,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
 	union semun
 	{
 		int                 val;
diff --git a/Foundation/src/NamedMutex_UNIX.cpp b/Foundation/src/NamedMutex_UNIX.cpp
index d923eb564..15a08b1f8 100644
--- a/Foundation/src/NamedMutex_UNIX.cpp
+++ b/Foundation/src/NamedMutex_UNIX.cpp
@@ -52,7 +52,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
 	union semun
 	{
 		int                 val;
diff --git a/components b/components
index afa79c016..673c89d11 100644
--- a/components
+++ b/components
@@ -9,11 +9,11 @@ NetSSL_OpenSSL
 Data
 Data/SQLite
 Data/ODBC
-#Data/MySQL
+Data/MySQL
 Zip
 PageCompiler
 PageCompiler/File2Page
-#ApacheConnector
+ApacheConnector
 PDF
 CppParser
 PocoDoc