diff --git a/docs/Makefile.am b/docs/Makefile.am
index e810dc21..32409e78 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -58,9 +58,11 @@ dist_man_MANS = \
 	libssh2_channel_write_stderr.3 \
 	libssh2_channel_x11_req.3 \
 	libssh2_channel_x11_req_ex.3 \
+	libssh2_exit.3 \
 	libssh2_free_host_entry.3 \
 	libssh2_host_entry_match.3 \
 	libssh2_hostkey_hash.3 \
+	libssh2_init.3 \
 	libssh2_knownhost_add.3 \
 	libssh2_knownhost_check.3 \
 	libssh2_knownhost_del.3 \
diff --git a/docs/libssh2_exit.3 b/docs/libssh2_exit.3
new file mode 100644
index 00000000..20c161af
--- /dev/null
+++ b/docs/libssh2_exit.3
@@ -0,0 +1,14 @@
+.TH libssh2_exit 3 "19 Mar 2010" "libssh2 1.2.5" "libssh2 manual"
+.SH NAME
+libssh2_init - global library deinitialization
+.SH SYNOPSIS
+#include <libssh2.h>
+
+int
+libssh2_exit(void);
+
+.SH DESCRIPTION
+Exit the libssh2 functions and free's all memory used internal.
+
+.SH SEE ALSO
+.BR libssh2_init(3)
diff --git a/docs/libssh2_init.3 b/docs/libssh2_init.3
new file mode 100644
index 00000000..687d878c
--- /dev/null
+++ b/docs/libssh2_init.3
@@ -0,0 +1,21 @@
+.TH libssh2_init 3 "19 Mar 2010" "libssh2 1.2.5" "libssh2 manual"
+.SH NAME
+libssh2_init - global library initialization
+.SH SYNOPSIS
+#include <libssh2.h>
+
+#define LIBSSH2_INIT_NO_CRYPTO 0x0001
+
+int
+libssh2_init(int flags);
+
+.SH DESCRIPTION
+Initialize the libssh2 functions.  This typically initialize the
+crypto library.  It uses a global state, and is not thread safe -- you
+must make sure this function is not called concurrently.
+
+.SH RETURN VALUE
+Returns 0 if succeeded, or a negative value for error.
+
+.SH SEE ALSO
+.BR libssh2_exit(3)
diff --git a/include/libssh2.h b/include/libssh2.h
index 0b1a9eab..c8df7dff 100644
--- a/include/libssh2.h
+++ b/include/libssh2.h
@@ -393,7 +393,7 @@ LIBSSH2_API int libssh2_init(int flags);
  *
  * Exit the libssh2 functions and free's all memory used internal.
  */
-LIBSSH2_API void libssh2_exit();
+LIBSSH2_API void libssh2_exit(void);
 
 /* Session API */
 LIBSSH2_API LIBSSH2_SESSION *