diff --git a/src/main/c/OSX/SerialPort_OSX.c b/src/main/c/OSX/SerialPort_OSX.c
index ddcf900..4262314 100644
--- a/src/main/c/OSX/SerialPort_OSX.c
+++ b/src/main/c/OSX/SerialPort_OSX.c
@@ -243,7 +243,15 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J
 
 	// Apply changes
 	ioctl(serialPortFD, TIOCEXCL);			// Block other non-root users from using this port
-	return ((tcsetattr(serialPortFD, TCSANOW, &options) == 0) ? JNI_TRUE : JNI_FALSE);
+	jboolean rc = ((tcsetattr(serialPortFD, TCSANOW, &options) == 0) ? JNI_TRUE : JNI_FALSE);
+
+        if (baudRateCode == 0) {
+                // use IOSSIOSPEED to set non-standard baud rate
+                speed_t speed = (speed_t)baudRate;
+                ioctl(serialPortFD, IOSSIOSPEED, &speed);
+        }
+
+        return rc;
 }
 
 JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeouts(JNIEnv *env, jobject obj, jlong serialPortFD)
diff --git a/src/main/resources/OSX/x86/libjSerialComm.jnilib b/src/main/resources/OSX/x86/libjSerialComm.jnilib
index 0dc3f7b..0af2785 100755
Binary files a/src/main/resources/OSX/x86/libjSerialComm.jnilib and b/src/main/resources/OSX/x86/libjSerialComm.jnilib differ
diff --git a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib
index 400131e..73ea3a1 100755
Binary files a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib and b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib differ