diff --git a/src/Core.h b/src/Core.h
index 80ccd999c..866e46ae9 100644
--- a/src/Core.h
+++ b/src/Core.h
@@ -186,7 +186,7 @@ typedef struct TextureRec_ { float U1, V1, U2, V2; } TextureRec;
 #define CC_BUILD_X11
 #define CC_BUILD_CURL
 #define CC_BUILD_OPENAL
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __DragonFly__
 #define CC_BUILD_FREEBSD
 #define CC_BUILD_POSIX
 #define CC_BUILD_GL
diff --git a/src/Logger.c b/src/Logger.c
index 0259cc365..61c7c3be0 100644
--- a/src/Logger.c
+++ b/src/Logger.c
@@ -554,6 +554,7 @@ static void Logger_PrintRegisters(String* str, void* ctx) {
 #endif
 }
 #elif defined CC_BUILD_FREEBSD
+/* See /usr/include/machine/ucontext.h */
 static void Logger_PrintRegisters(String* str, void* ctx) {
 	mcontext_t r = ((ucontext_t*)ctx)->uc_mcontext;
 #if defined __i386__
diff --git a/src/Makefile b/src/Makefile
index 448eb45b8..b9830df82 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -61,6 +61,12 @@ LDFLAGS=-L /usr/X11R7/lib -L /usr/pkg/lib
 LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi
 endif
 
+ifeq ($(PLAT),dragonfly)
+CFLAGS=-g -pipe -rdynamic -I /usr/local/include -fno-math-errno
+LDFLAGS=-L /usr/local/lib
+LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi -lm -lpthread
+endif
+
 ifeq ($(PLAT),haiku)
 CFLAGS=-g -pipe -fno-math-errno
 LDFLAGS=-g
@@ -89,6 +95,8 @@ openbsd:
 	$(MAKE) $(ENAME) PLAT=openbsd -j$(JOBS)
 netbsd:
 	$(MAKE) $(ENAME) PLAT=netbsd -j$(JOBS)
+dragonfly:
+	$(MAKE) $(ENAME) PLAT=dragonfly -j$(JOBS)
 haiku:
 	$(MAKE) $(ENAME) PLAT=haiku -j$(JOBS)
 	
diff --git a/src/Platform.c b/src/Platform.c
index 36b9f1f3f..b9673058e 100644
--- a/src/Platform.c
+++ b/src/Platform.c
@@ -71,6 +71,13 @@ const cc_result ReturnCode_SocketWouldBlock = EWOULDBLOCK;
 /* Platform specific include files (Try to share for UNIX-ish) */
 #if defined CC_BUILD_LINUX
 #define CC_BUILD_UNIX
+#elif defined CC_BUILD_OSX
+#include <mach/mach_time.h>
+#include <mach-o/dyld.h>
+#include <ApplicationServices/ApplicationServices.h>
+#elif defined CC_BUILD_SOLARIS
+#define CC_BUILD_UNIX
+#include <sys/filio.h>
 #elif defined CC_BUILD_FREEBSD
 #define CC_BUILD_UNIX
 #include <sys/sysctl.h>
@@ -80,13 +87,6 @@ const cc_result ReturnCode_SocketWouldBlock = EWOULDBLOCK;
 #elif defined CC_BUILD_NETBSD
 #define CC_BUILD_UNIX
 #include <sys/sysctl.h>
-#elif defined CC_BUILD_SOLARIS
-#define CC_BUILD_UNIX
-#include <sys/filio.h>
-#elif defined CC_BUILD_OSX
-#include <mach/mach_time.h>
-#include <mach-o/dyld.h>
-#include <ApplicationServices/ApplicationServices.h>
 #elif defined CC_BUILD_HAIKU
 #define CC_BUILD_UNIX
 /* TODO: Use open instead of xdg-open */