diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 10eb0ac312..7b9df4b5b9 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -247,7 +247,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     int masterfd = -1, slavefd = -1;
     char *slavedevice;
 
-#if defined(__sun) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
+#if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     /* FreeBSD 9.2 or later supports O_CLOEXEC
      * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
diff --git a/version.h b/version.h
index 07b8633de0..3b0aa97127 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 39
+#define RUBY_PATCHLEVEL 40
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3