diff --git a/CSFML/include/SFML/Config.h b/CSFML/include/SFML/Config.h
index bd75fa924..8a18eb6cd 100644
--- a/CSFML/include/SFML/Config.h
+++ b/CSFML/include/SFML/Config.h
@@ -44,6 +44,11 @@
     // MacOS
     #define CSFML_SYSTEM_MACOS
 
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+    // FreeBSD
+    #define CSFML_SYSTEM_FREEBSD
+
 #else
 
     // Unsupported system
diff --git a/CSFML/include/SFML/Window/WindowHandle.h b/CSFML/include/SFML/Window/WindowHandle.h
index 78d5750f8..31d0eb7e0 100644
--- a/CSFML/include/SFML/Window/WindowHandle.h
+++ b/CSFML/include/SFML/Window/WindowHandle.h
@@ -40,7 +40,7 @@
     // Windows defines a void* handle (HWND)
     typedef void* sfWindowHandle;
 
-#elif defined(CSFML_SYSTEM_LINUX)
+#elif defined(CSFML_SYSTEM_LINUX) || defined(CSFML_SYSTEM_FREEBSD)
 
     // Unix - X11 defines an unsigned integer handle (Window)
     typedef unsigned long sfWindowHandle;