diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp
index 307eef7..5915546 100644
--- a/uppsrc/Core/Stream.cpp
+++ b/uppsrc/Core/Stream.cpp
@@ -1331,7 +1331,7 @@ bool FileMapping::Map(int64 mapoffset, dword maplen)
 			(dword)(rawoffset >> 32), (dword)(rawoffset >> 0), rawsize);
 #else
 		rawbase = (byte *)mmap(0, rawsize, PROT_READ | PROT_WRITE,
-#ifdef PLATFORM_BSD
+#ifdef PLATFORM_FREEBSD
 			MAP_NOSYNC,
 #else
 			MAP_SHARED,
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index 60ce3ef..18567af 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -16,7 +16,7 @@ library(LINUX) dl;
 
 library(LINUX !XLFD) Xft;
 
-library(BSD) X11;
+library(BSD) "X11 Xau Xdmcp";
 
 library(BSD !XLFD) "Xft fontconfig Xrender freetype expat";
 
@@ -24,6 +24,8 @@ library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
 
 library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
 
+library(FREEBSD) xcb;
+
 file
 	Draw.h,
 	DrawWin32.h,