diff --git a/libmnetutil/bootstrap b/libmnetutil/bootstrap
index 7fe3377..5a5af06 100755
--- a/libmnetutil/bootstrap
+++ b/libmnetutil/bootstrap
@@ -28,7 +28,9 @@ elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
 elif automake --version > /dev/null 2>&1; then
   amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
-  if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
+  rpmvercmp "$amvers" "1.5" > /dev/null 2>&1
+  rpmverresult=$?
+  if [ $rpmverresult -lt 0 ] ; then
     amvers="no"
   else
     amvers=""
diff --git a/libmnetutil/source/SocketServer.cxx b/libmnetutil/source/SocketServer.cxx
index 5fad44e..082292f 100644
--- a/libmnetutil/source/SocketServer.cxx
+++ b/libmnetutil/source/SocketServer.cxx
@@ -35,6 +35,7 @@
 # include<fcntl.h>
 typedef int socklen_t;
 #else
+#include <unistd.h>
 #define closesocket close
 #endif