diff --git a/build_num b/build_num
index c37dc9cc9..c34aeeb15 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2923
+#define BUILD_NUM 2924
diff --git a/config.h.in b/config.h.in
index c68e770e2..8867f1740 100644
--- a/config.h.in
+++ b/config.h.in
@@ -61,6 +61,7 @@
 #undef HAVE_PTY_H
 #undef HAVE_LIBUTIL_H
 #undef HAVE_UTIL_H
+#undef HAVE_UNISTD_H
 
 #ifdef HAVE_GETOPT_H
 #  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8c6ee99f9..a0e8b36e5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,9 @@
 	* FWCmdAddObject.cpp (FWCmdAddObject::redo): fixed #1468 Open new
 	object in the editor after it has been created.
 
+	* applied patch by Vadim Jukov <persgray@gmail.com>, maintainer of
+	OpenBSD port. Patch fixes compile issues on OpenBSD
+
 2010-05-22 yalovoy <yalovoy@gmail.com>
 
 	* fixes #1463 Always show branch rule set name with action "Branch"
diff --git a/src/fwtransfer/TransferDevice.cpp b/src/fwtransfer/TransferDevice.cpp
index 4050ba11c..923fa5a62 100644
--- a/src/fwtransfer/TransferDevice.cpp
+++ b/src/fwtransfer/TransferDevice.cpp
@@ -19,6 +19,9 @@
 #include <string>
 
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <QDebug>
 #include <QString>
diff --git a/src/gui/FWBSettings.h b/src/gui/FWBSettings.h
index 2ac7ee058..61579bc8c 100644
--- a/src/gui/FWBSettings.h
+++ b/src/gui/FWBSettings.h
@@ -26,8 +26,6 @@
 #ifndef __FWBSETTINGS_H_
 #define __FWBSETTINGS_H_
 
-#include "fwbuilder/FWObject.h"
-
 
 #include <qsettings.h>
 #include <qrect.h>
@@ -38,6 +36,8 @@
 
 #define SETTINGS_PATH_PREFIX  "/4.0"
 
+#include <fwbuilder/FWObject.h>
+
 class QWidget;
 
 /*
diff --git a/src/gui/ssh_wrappers.cpp b/src/gui/ssh_wrappers.cpp
index e31cd9bb7..9bdc5e8e6 100644
--- a/src/gui/ssh_wrappers.cpp
+++ b/src/gui/ssh_wrappers.cpp
@@ -39,7 +39,6 @@
 #include <termios.h>
 #include <time.h>
 #include <sys/select.h>
-#include <utmpx.h>
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
diff --git a/src/transfer_agents/secuwall/transfer_secuwall.cpp b/src/transfer_agents/secuwall/transfer_secuwall.cpp
index 3f9e20a66..65011a273 100644
--- a/src/transfer_agents/secuwall/transfer_secuwall.cpp
+++ b/src/transfer_agents/secuwall/transfer_secuwall.cpp
@@ -14,10 +14,17 @@
  * o The terms of NetCitadel End User License Agreement
  */
 
+#include "../../../config.h"
+#include "../../../build_num"
+
 #include <iostream>
 #include <fstream>
 #include <sys/stat.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef _WIN32
 #include <windows.h>
 #include <direct.h>
@@ -35,9 +42,6 @@
 #endif
 #endif
 
-#include "../../../config.h"
-#include "../../../build_num"
-
 #include "fwbuilder/FWException.h"
 
 #include "fwtransfer/TransferDevice.h"