diff --git a/ChangeLog b/ChangeLog
index e3c8038..a8eff6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-21 master
+- Fixes:
+  - Merged patches and fixed other warnings on OpenBSD
+
 2017-12-20 16.0
 - Fixes:
   - Taskbar: `taskbar_distribute_size = 1` now playes well with `task_align = center` and
diff --git a/tint2.config b/tint2.config
index 2030c45..7781fd1 100644
--- a/tint2.config
+++ b/tint2.config
@@ -1,9 +1,17 @@
 // ADD PREDEFINED MACROS HERE!
-#define HAVE_RSVG 1
-#define HAVE_SN 1
+#define DISABLE_BACKTRACE 1
 #define ENABLE_BATTERY 1
 #define ENABLE_UEVENT 1
-#define GETTEXT_PACKAGE
-#define HAVE_TRACING
-#define ENABLE_EXECINFO
+#define GETTEXT_PACKAGE "tint2conf"
+#define HAS_GENERIC 1
+#define HAVE_RSVG 1
+#define HAVE_SN 1
+#define HAVE_VERSION_H 1
+#define INSTALL_PREFIX "/usr/local"
+#define LOCALEDIR "/usr/local/share/locale"
 #define SN_API_NOT_YET_FROZEN
+#define TINT2CONF 1
+#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#define _POSIX_C_SOURCE=200809L
+#define _WITH_GETLINE