diff --git a/README b/README
index 62eeb32..f2280a2 100644
--- a/README
+++ b/README
@@ -6,6 +6,8 @@ Version 0.7
 
   Added libssh2_userauth_hostbased_fromfile_ex() for authenticating from hostkey.
 
+  Added configure recognition for MacOSX (Darwin) (Thanks Gabe)
+
   Fixed extended data identification in libssh2_channel_read().
 
   Fixed window adjust code.  Hadn't acknowledged adjustments correctly.
diff --git a/configure.in b/configure.in
index d22f21e..4b2f577 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,11 @@ case "$host" in
 	SHLIB_LDFLAGS="-shared"
 	CFLAGS="$CFLAGS -DLIBSSH2_WIN32"
     ;;
+	*darwin*)
+	SHLIB_SUFFIX_NAME="dylib"
+	SHLIB_LDFLAGS="-dynamiclib -flat_namespace"
+	CFLAGS="$CFLAGS -DLIBSSH2_DARWIN"
+	;;
     *)
     SHLIB_SUFFIX_NAME="so"
     SHLIB_LDFLAGS="-shared"
diff --git a/include/libssh2.h b/include/libssh2.h
index 4b9f507..8b10a39 100644
--- a/include/libssh2.h
+++ b/include/libssh2.h
@@ -44,18 +44,19 @@
 
 /* Allow alternate API prefix from CFLAGS or calling app */
 #ifndef LIBSSH2_API
-#ifdef LIBSSH2_WIN32
-# ifdef LIBSSH2_LIBRARY
-#  define LIBSSH2_API __declspec(dllexport)
-# else
-#  define LIBSSH2_API __declspec(dllimport)
-# endif
-# ifndef _MSC_VER
-#  include <sys/uio.h>
-# endif
-#else
-# define LIBSSH2_API
-#endif
+# ifdef LIBSSH2_WIN32
+#  ifdef LIBSSH2_LIBRARY
+#   define LIBSSH2_API __declspec(dllexport)
+#  else
+#   define LIBSSH2_API __declspec(dllimport)
+#  endif /* LIBSSH2_LIBRARY */
+# else /* !LIBSSH2_WIN32 */
+#  define LIBSSH2_API
+# endif /* LIBSSH2_WIN32 */
+#endif /* LIBSSH2_API */
+
+#if defined(LIBSSH2_DARWIN) || (defined(LIBSSH2_WIN32) && !defined(_MSC_VER))
+# include <sys/uio.h>
 #endif
 
 #if defined(LIBSSH2_WIN32) && _MSC_VER < 1300