diff --git a/src/main/c/Posix/SerialPort_Posix.c b/src/main/c/Posix/SerialPort_Posix.c
index aafb09a..0f8425b 100644
--- a/src/main/c/Posix/SerialPort_Posix.c
+++ b/src/main/c/Posix/SerialPort_Posix.c
@@ -2,7 +2,7 @@
  * SerialPort_Posix.c
  *
  *       Created on:  Feb 25, 2012
- *  Last Updated on:  Nov 19, 2021
+ *  Last Updated on:  Dec 01, 2021
  *           Author:  Will Hedgecock
  *
  * Copyright (C) 2012-2021 Fazecast, Inc.
@@ -90,6 +90,10 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
 	driverBasedSearchForComPorts(&serialPorts, "/proc/tty/driver/mvebu_serial", "/dev/ttyMV");
 	lastDitchSearchForComPorts(&serialPorts);
 
+#elif defined(__FreeBSD__)
+
+	recursiveSearchForComPorts(&serialPorts, "/sys/devices/");
+
 #elif defined(__sun__) || defined(__APPLE__)
 
 	searchForComPorts(&serialPorts);
@@ -457,12 +461,20 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_waitForEvent(JNI
 
 JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNative(JNIEnv *env, jobject obj, jlong serialPortPointer)
 {
-	// Unblock, unlock, and close the port
+	// Force the port to enter non-blocking mode to ensure that any current reads return
+	struct termios options = { 0 };
 	serialPort *port = (serialPort*)(intptr_t)serialPortPointer;
+	tcgetattr(port->handle, &options);
+	options.c_cc[VMIN] = 0;
+	options.c_cc[VTIME] = 0;
+	fcntl(port->handle, F_SETFL, O_NONBLOCK);
+	tcsetattr(port->handle, TCSANOW, &options);
+	tcsetattr(port->handle, TCSANOW, &options);
+
+	// Unblock, unlock, and close the port
 	fsync(port->handle);
 	tcdrain(port->handle);
 	tcflush(port->handle, TCIOFLUSH);
-	fcntl(port->handle, F_SETFL, O_NONBLOCK);
 	flock(port->handle, LOCK_UN | LOCK_NB);
 	while (close(port->handle) && (errno == EINTR))
 		errno = 0;
diff --git a/src/main/c/Windows/SerialPort_Windows.c b/src/main/c/Windows/SerialPort_Windows.c
index 2152b35..d3df877 100644
--- a/src/main/c/Windows/SerialPort_Windows.c
+++ b/src/main/c/Windows/SerialPort_Windows.c
@@ -2,7 +2,7 @@
  * SerialPort_Windows.c
  *
  *       Created on:  Feb 25, 2012
- *  Last Updated on:  Nov 19, 2021
+ *  Last Updated on:  Dec 01, 2021
  *           Author:  Will Hedgecock
  *
  * Copyright (C) 2012-2021 Fazecast, Inc.
diff --git a/src/main/resources/Android/arm64-v8a/libjSerialComm.so b/src/main/resources/Android/arm64-v8a/libjSerialComm.so
index 174129a..76af7a0 100644
Binary files a/src/main/resources/Android/arm64-v8a/libjSerialComm.so and b/src/main/resources/Android/arm64-v8a/libjSerialComm.so differ
diff --git a/src/main/resources/Android/armeabi-v7a/libjSerialComm.so b/src/main/resources/Android/armeabi-v7a/libjSerialComm.so
index 32e8c91..d238f39 100644
Binary files a/src/main/resources/Android/armeabi-v7a/libjSerialComm.so and b/src/main/resources/Android/armeabi-v7a/libjSerialComm.so differ
diff --git a/src/main/resources/Android/x86/libjSerialComm.so b/src/main/resources/Android/x86/libjSerialComm.so
index 0bf2360..8db990b 100644
Binary files a/src/main/resources/Android/x86/libjSerialComm.so and b/src/main/resources/Android/x86/libjSerialComm.so differ
diff --git a/src/main/resources/Android/x86_64/libjSerialComm.so b/src/main/resources/Android/x86_64/libjSerialComm.so
index f4025d4..f89cdc3 100644
Binary files a/src/main/resources/Android/x86_64/libjSerialComm.so and b/src/main/resources/Android/x86_64/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv5/libjSerialComm.so b/src/main/resources/Linux/armv5/libjSerialComm.so
index 75e7491..908ab74 100644
Binary files a/src/main/resources/Linux/armv5/libjSerialComm.so and b/src/main/resources/Linux/armv5/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv6/libjSerialComm.so b/src/main/resources/Linux/armv6/libjSerialComm.so
index 17b8ae9..746e808 100644
Binary files a/src/main/resources/Linux/armv6/libjSerialComm.so and b/src/main/resources/Linux/armv6/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv6hf/libjSerialComm.so b/src/main/resources/Linux/armv6hf/libjSerialComm.so
index 16ad137..e8b56c8 100644
Binary files a/src/main/resources/Linux/armv6hf/libjSerialComm.so and b/src/main/resources/Linux/armv6hf/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv7/libjSerialComm.so b/src/main/resources/Linux/armv7/libjSerialComm.so
index c460e4e..6e5465e 100644
Binary files a/src/main/resources/Linux/armv7/libjSerialComm.so and b/src/main/resources/Linux/armv7/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv7hf/libjSerialComm.so b/src/main/resources/Linux/armv7hf/libjSerialComm.so
index ee4cbfa..2df30e7 100644
Binary files a/src/main/resources/Linux/armv7hf/libjSerialComm.so and b/src/main/resources/Linux/armv7hf/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv8_32/libjSerialComm.so b/src/main/resources/Linux/armv8_32/libjSerialComm.so
index f1f5b92..9778bee 100644
Binary files a/src/main/resources/Linux/armv8_32/libjSerialComm.so and b/src/main/resources/Linux/armv8_32/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/armv8_64/libjSerialComm.so b/src/main/resources/Linux/armv8_64/libjSerialComm.so
index 15887b3..e0b768d 100644
Binary files a/src/main/resources/Linux/armv8_64/libjSerialComm.so and b/src/main/resources/Linux/armv8_64/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/ppc64le/libjSerialComm.so b/src/main/resources/Linux/ppc64le/libjSerialComm.so
index 086980d..3901327 100644
Binary files a/src/main/resources/Linux/ppc64le/libjSerialComm.so and b/src/main/resources/Linux/ppc64le/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/x86/libjSerialComm.so b/src/main/resources/Linux/x86/libjSerialComm.so
index 54d07f4..2284cf7 100644
Binary files a/src/main/resources/Linux/x86/libjSerialComm.so and b/src/main/resources/Linux/x86/libjSerialComm.so differ
diff --git a/src/main/resources/Linux/x86_64/libjSerialComm.so b/src/main/resources/Linux/x86_64/libjSerialComm.so
index dbbb63c..8098783 100644
Binary files a/src/main/resources/Linux/x86_64/libjSerialComm.so and b/src/main/resources/Linux/x86_64/libjSerialComm.so differ
diff --git a/src/main/resources/OSX/aarch64/libjSerialComm.jnilib b/src/main/resources/OSX/aarch64/libjSerialComm.jnilib
index 76f7210..6ea9817 100755
Binary files a/src/main/resources/OSX/aarch64/libjSerialComm.jnilib and b/src/main/resources/OSX/aarch64/libjSerialComm.jnilib differ
diff --git a/src/main/resources/OSX/x86/libjSerialComm.jnilib b/src/main/resources/OSX/x86/libjSerialComm.jnilib
index 020d02e..8e49bca 100644
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 1f64010..e0e080b 100755
Binary files a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib and b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib differ
diff --git a/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so b/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so
index 50a08b2..c807421 100644
Binary files a/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so and b/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so differ
diff --git a/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so b/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so
index b071455..6997d36 100644
Binary files a/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so and b/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so differ
diff --git a/src/main/resources/Solaris/x86/libjSerialComm.so b/src/main/resources/Solaris/x86/libjSerialComm.so
index 9f2b854..4c97048 100644
Binary files a/src/main/resources/Solaris/x86/libjSerialComm.so and b/src/main/resources/Solaris/x86/libjSerialComm.so differ
diff --git a/src/main/resources/Solaris/x86_64/libjSerialComm.so b/src/main/resources/Solaris/x86_64/libjSerialComm.so
index c142183..6c1539e 100644
Binary files a/src/main/resources/Solaris/x86_64/libjSerialComm.so and b/src/main/resources/Solaris/x86_64/libjSerialComm.so differ
diff --git a/src/test/c/testOpenClose.c b/src/test/c/testOpenClose.c
index 706032e..e91d9c9 100644
--- a/src/test/c/testOpenClose.c
+++ b/src/test/c/testOpenClose.c
@@ -232,16 +232,24 @@ long openPortNative(void)
 
 long closePortNative(long serialPortFD)
 {
-   // Unblock, unlock, and close the port
-   fsync(serialPortFD);
-   tcdrain(serialPortFD);
-   tcflush(serialPortFD, TCIOFLUSH);
-   fcntl(serialPortFD, F_SETFL, O_NONBLOCK);
-   flock(serialPortFD, LOCK_UN | LOCK_NB);
-   while (close(serialPortFD) && (errno == EINTR))
-      errno = 0;
-   serialPortFD = -1;
-   return -1;
+	// Force the port to enter non-blocking mode to ensure that any current reads return
+	struct termios options = { 0 };
+	tcgetattr(serialPortFD, &options);
+	options.c_cc[VMIN] = 0;
+	options.c_cc[VTIME] = 0;
+	fcntl(serialPortFD, F_SETFL, O_NONBLOCK);
+	tcsetattr(serialPortFD, TCSANOW, &options);
+	tcsetattr(serialPortFD, TCSANOW, &options);
+
+	// Unblock, unlock, and close the port
+	fsync(serialPortFD);
+	tcdrain(serialPortFD);
+	tcflush(serialPortFD, TCIOFLUSH);
+	flock(serialPortFD, LOCK_UN | LOCK_NB);
+	while (close(serialPortFD) && (errno == EINTR))
+		errno = 0;
+	   serialPortFD = -1;
+	return -1;
 }
 
 int readBytes(long serialPortFD, char* buffer, long bytesToRead, long offset, int timeoutMode, int readTimeout)