diff --git a/Makefile b/Makefile
index a1a27e569..91e2161a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,93 +1,93 @@
 UPPDIR1 = ./uppsrc/
 
 UPPOUT = .cache/upp.out/
-CINC   =  -I$(UPPDIR1) `pkg-config --cflags freetype2` `pkg-config --cflags x11` `pkg-config --cflags fontconfig` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` `pkg-config --cflags libpng` -I./ -I$(UPPOUT)
-Macro  =  -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
+CINC   =  -I$(UPPDIR1) `pkg-config --cflags freetype2` `pkg-config --cflags x11` `pkg-config --cflags fontconfig` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` `pkg-config --cflags libpng` -I/usr/local/include -I./ -I$(UPPOUT)
+Macro  =  -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
 CXX = c++
 LINKER = $(CXX)
 CFLAGS = -O3 -ffunction-sections -fdata-sections 
 CXXFLAGS = -O3 -ffunction-sections -fdata-sections  -std=c++14
-LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
-LIBPATH =
+LDFLAGS = $(LINKOPTIONS)
+LIBPATH = -L"/usr/local/lib"
 AR = ar -sr
 
-OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Posix-Shared/
+OutDir_ide = $(UPPOUT)ide/GCC-Bsd-Gcc-Gui-Main-Openbsd-Posix-Shared/
 Macro_ide = $(Macro) -DflagMAIN
-OutDir_ide_Common = $(UPPOUT)ide/Common/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Common = $(UPPOUT)ide/Common/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Common = $(Macro)
-OutDir_ide_Core = $(UPPOUT)ide/Core/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Core = $(UPPOUT)ide/Core/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Core = $(Macro)
-OutDir_ide_LayDes = $(UPPOUT)ide/LayDes/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_LayDes = $(UPPOUT)ide/LayDes/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_LayDes = $(Macro)
-OutDir_ide_IconDes = $(UPPOUT)ide/IconDes/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_IconDes = $(UPPOUT)ide/IconDes/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_IconDes = $(Macro)
-OutDir_ide_Builders = $(UPPOUT)ide/Builders/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Builders = $(UPPOUT)ide/Builders/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Builders = $(Macro)
-OutDir_ide_Debuggers = $(UPPOUT)ide/Debuggers/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Debuggers = $(UPPOUT)ide/Debuggers/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Debuggers = $(Macro)
-OutDir_ide_Browser = $(UPPOUT)ide/Browser/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Browser = $(UPPOUT)ide/Browser/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Browser = $(Macro)
-OutDir_CodeEditor = $(UPPOUT)CodeEditor/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_CodeEditor = $(UPPOUT)CodeEditor/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_CodeEditor = $(Macro)
-OutDir_CtrlLib = $(UPPOUT)CtrlLib/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_CtrlLib = $(UPPOUT)CtrlLib/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_CtrlLib = $(Macro)
-OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_bz2 = $(Macro)
-OutDir_HexView = $(UPPOUT)HexView/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_HexView = $(UPPOUT)HexView/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_HexView = $(Macro)
-OutDir_plugin_astyle = $(UPPOUT)plugin/astyle/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_astyle = $(UPPOUT)plugin/astyle/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_astyle = $(Macro)
-OutDir_TextDiffCtrl = $(UPPOUT)TextDiffCtrl/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_TextDiffCtrl = $(UPPOUT)TextDiffCtrl/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_TextDiffCtrl = $(Macro)
-OutDir_TabBar = $(UPPOUT)TabBar/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_TabBar = $(UPPOUT)TabBar/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_TabBar = $(Macro)
-OutDir_ide_Designers = $(UPPOUT)ide/Designers/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Designers = $(UPPOUT)ide/Designers/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Designers = $(Macro)
-OutDir_ide_Android = $(UPPOUT)ide/Android/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Android = $(UPPOUT)ide/Android/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Android = $(Macro)
-OutDir_ide_Java = $(UPPOUT)ide/Java/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_Java = $(UPPOUT)ide/Java/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_Java = $(Macro)
-OutDir_ide_MacroManager = $(UPPOUT)ide/MacroManager/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_ide_MacroManager = $(UPPOUT)ide/MacroManager/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_ide_MacroManager = $(Macro)
-OutDir_urepo = $(UPPOUT)urepo/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_urepo = $(UPPOUT)urepo/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_urepo = $(Macro)
-OutDir_Report = $(UPPOUT)Report/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_Report = $(UPPOUT)Report/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_Report = $(Macro)
-OutDir_Esc = $(UPPOUT)Esc/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_Esc = $(UPPOUT)Esc/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_Esc = $(Macro)
-OutDir_Core = $(UPPOUT)Core/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_Core = $(UPPOUT)Core/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_Core = $(Macro)
-OutDir_plugin_lzma = $(UPPOUT)plugin/lzma/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_lzma = $(UPPOUT)plugin/lzma/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_lzma = $(Macro)
-OutDir_plugin_lz4 = $(UPPOUT)plugin/lz4/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_lz4 = $(UPPOUT)plugin/lz4/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_lz4 = $(Macro)
-OutDir_plugin_zstd = $(UPPOUT)plugin/zstd/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_zstd = $(UPPOUT)plugin/zstd/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_zstd = $(Macro)
-OutDir_RichEdit = $(UPPOUT)RichEdit/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_RichEdit = $(UPPOUT)RichEdit/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_RichEdit = $(Macro)
-OutDir_IconDes = $(UPPOUT)IconDes/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_IconDes = $(UPPOUT)IconDes/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_IconDes = $(Macro)
-OutDir_CppBase = $(UPPOUT)CppBase/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_CppBase = $(UPPOUT)CppBase/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_CppBase = $(Macro)
-OutDir_plugin_gif = $(UPPOUT)plugin/gif/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_gif = $(UPPOUT)plugin/gif/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_gif = $(Macro)
-OutDir_plugin_jpg = $(UPPOUT)plugin/jpg/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_jpg = $(UPPOUT)plugin/jpg/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_jpg = $(Macro)
-OutDir_Painter = $(UPPOUT)Painter/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_Painter = $(UPPOUT)Painter/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_Painter = $(Macro)
-OutDir_Draw = $(UPPOUT)Draw/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_Draw = $(UPPOUT)Draw/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_Draw = $(Macro)
-OutDir_PdfDraw = $(UPPOUT)PdfDraw/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_PdfDraw = $(UPPOUT)PdfDraw/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_PdfDraw = $(Macro)
-OutDir_plugin_pcre = $(UPPOUT)plugin/pcre/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_pcre = $(UPPOUT)plugin/pcre/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_pcre = $(Macro)
-OutDir_CtrlCore = $(UPPOUT)CtrlCore/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_CtrlCore = $(UPPOUT)CtrlCore/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_CtrlCore = $(Macro)
-OutDir_plugin_bmp = $(UPPOUT)plugin/bmp/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_bmp = $(UPPOUT)plugin/bmp/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_bmp = $(Macro)
-OutDir_RichText = $(UPPOUT)RichText/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_RichText = $(UPPOUT)RichText/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_RichText = $(Macro)
-OutDir_plugin_png = $(UPPOUT)plugin/png/GCC-Gcc-Gui-Linux-Posix-Shared/
+OutDir_plugin_png = $(UPPOUT)plugin/png/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/
 Macro_plugin_png = $(Macro)
 
 OutDir = $(OutDir_ide)
@@ -253,7 +253,7 @@ $(OutFile): build_info  \
 	$(OutDir_RichText)RichText.a \
 	$(OutDir_plugin_png)pngreg.o \
 	$(OutDir_plugin_png)png.a
-	$(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) -Wl,-O,2 $(LDFLAGS) -Wl,--start-group  \
+	$(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) $(LDFLAGS) -Wl,--start-group  \
 		$(OutDir_ide)BaseDlg.o \
 		$(OutDir_ide)SelectPkg.o \
 		$(OutDir_ide)UppWspc.o \
@@ -377,8 +377,8 @@ $(OutFile): build_info  \
 			`pkg-config --libs libpng` \
 			-lbz2 \
 			-lpthread \
-			-ldl \
-			-lrt \
+			-lexecinfo \
+			 \
 			-lz -Wl,--end-group
 
 $(OutDir_ide):
diff --git a/configure_makefile b/configure_makefile
index 111b8a777..e4b2a8257 100755
--- a/configure_makefile
+++ b/configure_makefile
@@ -28,3 +28,19 @@ if [[ "$uname" == 'FreeBSD' ]]; then
 	sed -i '' 's/$(LIBPATH) -Wl,-O,2 $(LDFLAGS)/$(LIBPATH) $(LDFLAGS)/' $1
 	sed -i '' 's/-ldl /-lexecinfo /' $1
 fi
+
+if [[ "$uname" == 'OpenBSD' ]]; then
+	echo Configuring $1 for OpenBSD
+	sed -i.bak 's/-DflagPOSIX -DflagLINUX/-DflagPOSIX -DflagBSD -DflagFREEBSD/' $1
+	sed -i.bak 's/-Wl,--gc-sections $(LINKOPTIONS)/$(LINKOPTIONS)/' $1
+	sed -i.bak 's#LIBPATH =#LIBPATH = -L"/usr/local/lib"#' $1
+	sed -i.bak 's#-I./ -I$(UPPOUT)#-I/usr/local/include -I./ -I$(UPPOUT)#' $1
+	sed -i.bak 's/GCC-Gcc-Gui-Linux-Main-Posix-Shared/GCC-Bsd-Gcc-Gui-Main-Openbsd-Posix-Shared/' $1
+	sed -i.bak 's/GCC-Gcc-Gui-Linux-Posix-Shared/GCC-Bsd-Gcc-Gui-Openbsd-Posix-Shared/' $1
+	sed -i.bak 's/GCC-Gcc-Linux-Main-Posix-Shared/GCC-Bsd-Gcc-Main-Openbsd-Posix-Shared/' $1
+	sed -i.bak 's/GCC-Gcc-Linux-Posix-Shared/GCC-Bsd-Gcc-Openbsd-Posix-Shared/' $1
+	sed -i.bak 's/$(LIBPATH) -Wl,-O,2 $(LDFLAGS)/$(LIBPATH) $(LDFLAGS)/' $1
+	sed -i.bak 's/-ldl /-lexecinfo /' $1
+	sed -i.bak 's/-lrt / /' $1
+	rm  $1.bak
+fi
diff --git a/umkMakefile b/umkMakefile
index e8a6003b2..d35e85c82 100644
--- a/umkMakefile
+++ b/umkMakefile
@@ -1,39 +1,39 @@
 UPPDIR1 = ./uppsrc/
 
 UPPOUT = .cache/upp.out/
-CINC   =  -I$(UPPDIR1) -I./ -I$(UPPOUT)
-Macro  =  -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
+CINC   =  -I$(UPPDIR1) -I/usr/local/include -I./ -I$(UPPOUT)
+Macro  =  -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
 CXX = c++
 LINKER = $(CXX)
 CFLAGS = -O3 -ffunction-sections -fdata-sections 
 CXXFLAGS = -O3 -ffunction-sections -fdata-sections  -std=c++14
-LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
-LIBPATH =
+LDFLAGS = $(LINKOPTIONS)
+LIBPATH = -L"/usr/local/lib"
 AR = ar -sr
 
-OutDir_umk = $(UPPOUT)umk/GCC-Gcc-Linux-Main-Posix-Shared/
+OutDir_umk = $(UPPOUT)umk/GCC-Bsd-Gcc-Main-Openbsd-Posix-Shared/
 Macro_umk = $(Macro) -DflagMAIN
-OutDir_ide_Builders = $(UPPOUT)ide/Builders/GCC-Gcc-Linux-Posix-Shared/
+OutDir_ide_Builders = $(UPPOUT)ide/Builders/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_ide_Builders = $(Macro)
-OutDir_ide_Core = $(UPPOUT)ide/Core/GCC-Gcc-Linux-Posix-Shared/
+OutDir_ide_Core = $(UPPOUT)ide/Core/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_ide_Core = $(Macro)
-OutDir_ide_Android = $(UPPOUT)ide/Android/GCC-Gcc-Linux-Posix-Shared/
+OutDir_ide_Android = $(UPPOUT)ide/Android/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_ide_Android = $(Macro)
-OutDir_ide_Java = $(UPPOUT)ide/Java/GCC-Gcc-Linux-Posix-Shared/
+OutDir_ide_Java = $(UPPOUT)ide/Java/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_ide_Java = $(Macro)
-OutDir_Esc = $(UPPOUT)Esc/GCC-Gcc-Linux-Posix-Shared/
+OutDir_Esc = $(UPPOUT)Esc/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_Esc = $(Macro)
-OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC-Gcc-Linux-Posix-Shared/
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_plugin_bz2 = $(Macro)
-OutDir_plugin_lzma = $(UPPOUT)plugin/lzma/GCC-Gcc-Linux-Posix-Shared/
+OutDir_plugin_lzma = $(UPPOUT)plugin/lzma/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_plugin_lzma = $(Macro)
-OutDir_plugin_lz4 = $(UPPOUT)plugin/lz4/GCC-Gcc-Linux-Posix-Shared/
+OutDir_plugin_lz4 = $(UPPOUT)plugin/lz4/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_plugin_lz4 = $(Macro)
-OutDir_plugin_zstd = $(UPPOUT)plugin/zstd/GCC-Gcc-Linux-Posix-Shared/
+OutDir_plugin_zstd = $(UPPOUT)plugin/zstd/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_plugin_zstd = $(Macro)
-OutDir_Core = $(UPPOUT)Core/GCC-Gcc-Linux-Posix-Shared/
+OutDir_Core = $(UPPOUT)Core/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_Core = $(Macro)
-OutDir_plugin_pcre = $(UPPOUT)plugin/pcre/GCC-Gcc-Linux-Posix-Shared/
+OutDir_plugin_pcre = $(UPPOUT)plugin/pcre/GCC-Bsd-Gcc-Openbsd-Posix-Shared/
 Macro_plugin_pcre = $(Macro)
 
 OutDir = $(OutDir_umk)
@@ -81,7 +81,7 @@ $(OutFile): build_info  \
 	$(OutDir_plugin_zstd)zstd.a \
 	$(OutDir_Core)Core.a \
 	$(OutDir_plugin_pcre)pcre.a
-	$(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) -Wl,-O,2 $(LDFLAGS) -Wl,--start-group  \
+	$(LINKER) -o "$(OutFile)" -Wl,-s $(LIBPATH) $(LDFLAGS) -Wl,--start-group  \
 		$(OutDir_umk)MacOs.o \
 		$(OutDir_umk)Console.o \
 		$(OutDir_umk)IdeContext.o \
@@ -101,8 +101,8 @@ $(OutFile): build_info  \
 			$(OutDir_plugin_pcre)pcre.a \
 			-lbz2 \
 			-lpthread \
-			-ldl \
-			-lrt \
+			-lexecinfo \
+			 \
 			-lz -Wl,--end-group
 
 $(OutDir_umk):
diff --git a/uppbox/MakePosixInstall/Main.cpp b/uppbox/MakePosixInstall/Main.cpp
index dfa71c4c5..c3cc74063 100644
--- a/uppbox/MakePosixInstall/Main.cpp
+++ b/uppbox/MakePosixInstall/Main.cpp
@@ -119,6 +119,8 @@ CONSOLE_APP_MAIN
 	
 	SaveScript("install", install_script);
 	SaveScript("clean", clean_script);
+	SaveScript("configure", LoadFile(upp_src + "/configure"));
+	SaveScript("configure_makefile", LoadFile(upp_src + "/configure_makefile"));
 	SaveText("README", readme);
 
 #ifdef _DEBUG
@@ -132,7 +134,7 @@ CONSOLE_APP_MAIN
 #endif
 
 	Syx(GetHomeDirFile("bin/umk") + " ./uppsrc umk GCC -rvsM");
-	FixMakefile(release + "/uMakefile", release + "/Makefile");
+	FixMakefile(release + "/umkMakefile", release + "/Makefile");
 	Syx(GetHomeDirFile("bin/umk") + " ./uppsrc ide GCC -rvsM theide");
 	FixMakefile(release + "/Makefile", release + "/Makefile");
 
diff --git a/uppbox/MakePosixInstall/readme.cpp b/uppbox/MakePosixInstall/readme.cpp
index 3e74dec85..118289ba8 100644
--- a/uppbox/MakePosixInstall/readme.cpp
+++ b/uppbox/MakePosixInstall/readme.cpp
@@ -55,7 +55,14 @@ pkg_add bash pkgconfig
 
 (this should work as long as you have installed desktop environment before installing U++).
 
-It is also necessary to
+It is also necessary to increase the allowed memory sizes in /etc/login.conf to
+
+default:\
+	:datasize-max=4096M:\
+	:datasize-cur=4096M:\
+	:stacksize-cur=512M:\
+
+otherwise compiler will run out of memory.
 
 )--";
 
diff --git a/uppbox/MakePosixInstall/scripts.cpp b/uppbox/MakePosixInstall/scripts.cpp
index 8ccdaa8d0..74f90b7ee 100644
--- a/uppbox/MakePosixInstall/scripts.cpp
+++ b/uppbox/MakePosixInstall/scripts.cpp
@@ -24,19 +24,27 @@ elif [ -x "$(command -v zypper)" ]; then
 elif [ -x "$(command -v pacman)" ]; then
   DEP="pacman -Sy --needed gcc make zlib bzip2 gtk3 libnotify openssl clang"
 elif [ -x "$(command -v pkg)" ]; then
+  DEP="pkg install bash gmake gtk3 libnotify llvm90 pkgconf"
   if [[ "$uname" == 'SunOS' ]]; then
      DEP="pkg install bash gtk3 libnotify developer/clang-80 build-essential"
-  else
-     DEP="pkg install bash gmake gtk3 libnotify llvm90 pkgconf"
   fi
 elif [ -x "$(command -v pkg_add)" ]; then
   DEP="pkg_add bash gmake gtk3 libnotify clang-devel"
 fi
 
+if [[ "$uname" == 'OpenBSD' ]]; then
+  DEP=""
+fi
+
 if [ -z "$DEP" ]; then
-  echo Packaging system was not identified.
-  echo Automatic dependency instalation has failed.
-  echo You will have to install required packages manually.
+  if [[ "$uname" == 'OpenBSD' ]]; then
+    echo Automatic dependecies installation is not supported on OpenBSD.
+    echo See README for details.
+  else
+    echo Packaging system was not identified.
+    echo Automatic dependency instalation has failed.
+    echo You will have to install required packages manually.
+  fi
   echo Please make sure that build dependecies are satisfied.
   AskContinue
 else
@@ -70,7 +78,8 @@ fi
 
 if [ -z "$UMK" ]; then
   echo umks32 cannot be used, building umk using make
-  make -f uMakefile -j 4
+  ./configure
+  make -f umkMakefile -j 4
   UMK="./umk"
 fi
 
diff --git a/uppsrc/CtrlCore/GtkX11Util.cpp b/uppsrc/CtrlCore/GtkX11Util.cpp
index 00ef087c7..9250827b9 100644
--- a/uppsrc/CtrlCore/GtkX11Util.cpp
+++ b/uppsrc/CtrlCore/GtkX11Util.cpp
@@ -10,7 +10,10 @@ namespace Upp {
 #define Font        XFont
 #define Display     XDisplay
 #define Picture     XPicture
+
+#ifndef PLATFORM_OPENBSD // avoid warning
 #define CurrentTime XCurrentTime
+#endif
 
 #include <gdk/gdkx.h>
 
@@ -18,7 +21,10 @@ namespace Upp {
 #undef Time
 #undef Font
 #undef Display
+
+#ifndef PLATFORM_OPENBSD // avoid warning
 #undef CurrentTime
+#endif
 
 XDisplay *Xdisplay()
 {