diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index 1f3108d25..3bacc89c5 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -337,7 +337,7 @@ inline bool IsInf(double d)        { return std::isinf(d); }
 inline bool IsNaN(double d)        { return _isnan(d); }
 inline bool IsInf(double d)        { return !_finite(d) && !_isnan(d); }
 #endif
-#elif __APPLE__
+#elif __APPLE__ || __DragonFly__
 inline bool IsNaN(double d)        { return std::isnan(d); }
 inline bool IsInf(double d)        { return std::isinf(d); }
 #else
diff --git a/uppsrc/Core/config.h b/uppsrc/Core/config.h
index a34cad018..0d8aa3bc9 100644
--- a/uppsrc/Core/config.h
+++ b/uppsrc/Core/config.h
@@ -31,7 +31,7 @@
 		#else
 			// zvzv mod
 			// was: #if __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __APPLE__
-			#if __FreeBSD__ || __OpenBSD__ || __NetBSD__
+			#if __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__
 				#define PLATFORM_BSD 1
 				#if __FreeBSD__
 					#define PLATFORM_FREEBSD 1
@@ -42,6 +42,9 @@
 				#if __NetBSD__
 					#define PLATFORM_NETBSD 1
 				#endif
+				#if __DragonFly__
+					#define PLATFORM_DRAGONFLY 1
+				#endif
 			#elif __sun
 				#define PLATFORM_SOLARIS 1
 			#else
diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
index f2ce446a4..d315e50eb 100644
--- a/uppsrc/CtrlCore/CtrlCore.upp
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -27,10 +27,12 @@ library(LINUX !XLFD !SHARED  !RAINBOW GUI) "fontconfig Xrender freetype";
 
 library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
 
-library(FREEBSD) xcb;
+library(FREEBSD | DRAGONFLY) xcb;
 
 library(POSIX !NOGTK !RAINBOW GUI) notify;
 
+library(DRAGONFLY) "Xext Xinerama";
+
 file
 	Core readonly separator,
 	CtrlCore.h,
diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp
index 4dd25a02a..d0a304ca8 100644
--- a/uppsrc/CtrlLib/ChGtk.cpp
+++ b/uppsrc/CtrlLib/ChGtk.cpp
@@ -1,9 +1,10 @@
 #include "CtrlLib.h"
-#include "ChGtk.h"
 
 #ifdef PLATFORM_X11
 #ifndef flagNOGTK
 
+#include "ChGtk.h"
+
 #define LLOG(x)  // DLOG(x)
 #define LDUMP(x) // DDUMP(x)
 
diff --git a/uppsrc/GLCtrl/GLCtrl.upp b/uppsrc/GLCtrl/GLCtrl.upp
index 0f5a7420c..627760163 100644
--- a/uppsrc/GLCtrl/GLCtrl.upp
+++ b/uppsrc/GLCtrl/GLCtrl.upp
@@ -5,7 +5,7 @@ library(WIN32 GCC) "glaux glu32 opengl32";
 
 library(LINUX) "GL GLU";
 
-library(FREEBSD) "GL GLU";
+library(BSD) "GL GLU";
 
 library(GTK) "gdkglext-x11-1.0 gtkglext-x11-1.0";
 
diff --git a/uppsrc/Skylark/App.cpp b/uppsrc/Skylark/App.cpp
index 6cd5ab9c3..a937fd01f 100644
--- a/uppsrc/Skylark/App.cpp
+++ b/uppsrc/Skylark/App.cpp
@@ -12,7 +12,7 @@ namespace Upp {
 
 String GetThreadName()
 {
-	return FormatIntBase(Thread::GetCurrentId() % 33, 35);
+	return FormatIntBase((int64)(Thread::GetCurrentId()) % 33, 35);
 }
 	
 namespace Ini {
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index 5a0b281f7..d8b7fc3fa 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -338,6 +338,10 @@ void LocalHost::AddFlags(Index<String>& cfg)
 	cfg.Add("NETBSD");
 #endif
 
+#ifdef PLATFORM_DRAGONFLY
+	cfg.Add("DRAGONFLY");
+#endif
+
 #ifdef PLATFORM_SOLARIS
 	cfg.Add("SOLARIS");
 #endif