diff --git a/CHANGELOG b/CHANGELOG
index 2753021f3..13a5684b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [GH#274] Use a shorter pcap_select timeout on OpenBSD, just as we do for OS
+  X, old FreeBSD, and Solaris, which use BPF for packet capture and do not have
+  properly select-able fds. Fix by OpenBSD port maintainer [David Carlier]
+
 o [NSE] Added ms-sql-ntlm-info for extracting OS version and sometimes hostname
   from MS SQL Server instances via the NTLM challenge message. [Justin Cacak]
 
@@ -22,7 +26,7 @@ o [NSE] Added http-vuln-cve2013-6786 for detecting a XSS and URL redirection
   vulnerability in Allegro RomPager web server. Also added a fingerprint for
   detecting CVE-2014-4019 to http-fingerprints.lua. [Vlatko Kosturjak]
 
-o When provided a verbosity of 0 (-v0), Nmap will not output any text to the
+o [GH#265] When provided a verbosity of 0 (-v0), Nmap will not output any text to the
   screen. This happens at the time of argument parsing, so the usual meaning of
   "verbosity 0" is preserved. [isjing]
 
diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
index 7bf494880..b1eda2c8a 100644
--- a/libnetutil/netutil.cc
+++ b/libnetutil/netutil.cc
@@ -915,7 +915,7 @@ void set_ttl(int sd, int ttl) {
 /* Other than WIN32, what these systems have in common is that they use BPF for
    packet capture. (Solaris 10 and earlier used DLPI and had valid selectable
    fds.) */
-#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000) || defined(SOLARIS_BPF_PCAP_CAPTURE))
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) || defined(SOLARIS_BPF_PCAP_CAPTURE) || defined(OPENBSD)
 /* Returns whether the system supports pcap_get_selectable_fd() properly */
 int pcap_selectable_fd_valid() {
   return 0;