diff --git a/docs/libssh2_banner_set.3 b/docs/libssh2_banner_set.3
index 5b2b7993..5f687e5a 100644
--- a/docs/libssh2_banner_set.3
+++ b/docs/libssh2_banner_set.3
@@ -11,8 +11,8 @@ int
 libssh2_banner_set(LIBSSH2_SESSION *session, const char *banner);
 .fi
 .SH DESCRIPTION
-This function is \fBDEPRECATED\fP. Use \fIlibssh2_session_banner_set(3)\fP
-instead!
+This function is \fBDEPRECATED\fP in 1.4.0. Use the
+\fIlibssh2_session_banner_set(3)\fP function instead!
 
 \fIsession\fP - Session instance as returned by
 .BR libssh2_session_init_ex(3)
diff --git a/docs/libssh2_channel_handle_extended_data.3 b/docs/libssh2_channel_handle_extended_data.3
index d73b91c7..ff494383 100644
--- a/docs/libssh2_channel_handle_extended_data.3
+++ b/docs/libssh2_channel_handle_extended_data.3
@@ -12,7 +12,7 @@ libssh2_channel_handle_extended_data(LIBSSH2_CHANNEL *channel,
                                      int ignore_mode);
 .fi
 .SH DESCRIPTION
-This function is deprecated. Use the
+This function is \fBDEPRECATED\fP in 1.1.0. Use the
 \fIlibssh2_channel_handle_extended_data2(3)\fP function instead!
 
 \fIchannel\fP - Active channel stream to change extended data handling on.
diff --git a/docs/libssh2_channel_ignore_extended_data.3 b/docs/libssh2_channel_ignore_extended_data.3
index 9bdebc65..ff8f4900 100644
--- a/docs/libssh2_channel_ignore_extended_data.3
+++ b/docs/libssh2_channel_ignore_extended_data.3
@@ -12,7 +12,7 @@ libssh2_channel_ignore_extended_data(LIBSSH2_CHANNEL *channel,
                                      int ignore_mode);
 .fi
 .SH DESCRIPTION
-This function is deprecated. Use the
+This function is \fBDEPRECATED\fP in 0.3.0. Use the
 \fIlibssh2_channel_handle_extended_data2(3)\fP function instead!
 
 This is a macro defined in a public libssh2 header file that is using the
diff --git a/docs/libssh2_channel_receive_window_adjust.3 b/docs/libssh2_channel_receive_window_adjust.3
index 14847ca8..af0df2e2 100644
--- a/docs/libssh2_channel_receive_window_adjust.3
+++ b/docs/libssh2_channel_receive_window_adjust.3
@@ -13,8 +13,8 @@ libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL * channel,
                                       unsigned char force);
 .fi
 .SH DESCRIPTION
-This function is deprecated in 1.1. Use
-\fIlibssh2_channel_receive_window_adjust2(3)\fP!
+This function is \fBDEPRECATED\fP in 1.1.0. Use the
+\fIlibssh2_channel_receive_window_adjust2(3)\fP function instead!
 
 Adjust the receive window for a channel by adjustment bytes. If the amount to
 be adjusted is less than LIBSSH2_CHANNEL_MINADJUST and force is 0 the
diff --git a/docs/libssh2_scp_recv.3 b/docs/libssh2_scp_recv.3
index b9a7732a..93bcee86 100644
--- a/docs/libssh2_scp_recv.3
+++ b/docs/libssh2_scp_recv.3
@@ -11,8 +11,8 @@ LIBSSH2_CHANNEL *
 libssh2_scp_recv(LIBSSH2_SESSION *session, const char *path, struct stat *sb);
 .fi
 .SH DESCRIPTION
-This function is \fBDEPRECATED\fP. Use \fIlibssh2_scp_recv2(3)\fP
-instead!
+This function is \fBDEPRECATED\fP in 1.7.0. Use the
+\fIlibssh2_scp_recv2(3)\fP function instead!
 
 \fIsession\fP - Session instance as returned by
 .BR libssh2_session_init_ex(3)
diff --git a/include/libssh2.h b/include/libssh2.h
index 763ad51d..385d1194 100644
--- a/include/libssh2.h
+++ b/include/libssh2.h
@@ -150,6 +150,35 @@ typedef int libssh2_socket_t;
 #define LIBSSH2_SOCKET_CLOSE(s) close(s)
 #endif /* _WIN32 */
 
+/* Compile-time deprecation macros */
+#if !defined(LIBSSH2_DISABLE_DEPRECATION) && !defined(LIBSSH2_LIBRARY)
+#  if defined(_MSC_VER)
+#    if _MSC_VER >= 1400
+#      define LIBSSH2_DEPRECATED(version, message) \
+         __declspec(deprecated("since libssh2 " # version ". " message))
+#    elif _MSC_VER >= 1310
+#      define LIBSSH2_DEPRECATED(version, message) \
+         __declspec(deprecated)
+#   endif
+#  elif defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#    if (defined(__clang__) && __clang_major__ >= 3) || \
+        (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#      define LIBSSH2_DEPRECATED(version, message) \
+         __attribute__((deprecated("since libssh2 " # version ". " message)))
+#    elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#      define LIBSSH2_DEPRECATED(version, message) \
+         __attribute__((deprecated))
+#    endif
+#  elif defined(__SUNPRO_C) && __SUNPRO_C >= 0x5130
+#    define LIBSSH2_DEPRECATED(version, message) \
+       __attribute__((deprecated))
+#  endif
+#endif
+
+#ifndef LIBSSH2_DEPRECATED
+#define LIBSSH2_DEPRECATED(version, message)
+#endif
+
 /*
  * Determine whether there is small or large file support on windows.
  */
@@ -621,9 +650,11 @@ LIBSSH2_API void *libssh2_session_callback_set(LIBSSH2_SESSION *session,
 LIBSSH2_API int libssh2_session_banner_set(LIBSSH2_SESSION *session,
                                            const char *banner);
 #ifndef LIBSSH2_NO_DEPRECATED
+LIBSSH2_DEPRECATED(1.4.0, "Use libssh2_session_banner_set()")
 LIBSSH2_API int libssh2_banner_set(LIBSSH2_SESSION *session,
                                    const char *banner);
 
+LIBSSH2_DEPRECATED(1.2.8, "Use libssh2_session_handshake()")
 LIBSSH2_API int libssh2_session_startup(LIBSSH2_SESSION *session, int sock);
 #endif
 LIBSSH2_API int libssh2_session_handshake(LIBSSH2_SESSION *session,
@@ -913,7 +944,7 @@ libssh2_channel_window_read_ex(LIBSSH2_CHANNEL *channel,
     libssh2_channel_window_read_ex((channel), NULL, NULL)
 
 #ifndef LIBSSH2_NO_DEPRECATED
-/* libssh2_channel_receive_window_adjust() is DEPRECATED, do not use! */
+LIBSSH2_DEPRECATED(1.1.0, "Use libssh2_channel_receive_window_adjust2()")
 LIBSSH2_API unsigned long
 libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel,
                                       unsigned long adjustment,
@@ -958,7 +989,7 @@ LIBSSH2_API void libssh2_session_set_read_timeout(LIBSSH2_SESSION* session,
 LIBSSH2_API long libssh2_session_get_read_timeout(LIBSSH2_SESSION* session);
 
 #ifndef LIBSSH2_NO_DEPRECATED
-/* libssh2_channel_handle_extended_data() is DEPRECATED, do not use! */
+LIBSSH2_DEPRECATED(1.1.0, "libssh2_channel_handle_extended_data2()")
 LIBSSH2_API void libssh2_channel_handle_extended_data(LIBSSH2_CHANNEL *channel,
                                                       int ignore_mode);
 #endif
@@ -973,7 +1004,7 @@ LIBSSH2_API int libssh2_channel_handle_extended_data2(LIBSSH2_CHANNEL *channel,
  * LIBSSH2_CHANNEL_EXTENDED_DATA_MERGE is passed, extended data will be read
  * (FIFO) from the standard data channel
  */
-/* DEPRECATED */
+/* DEPRECATED since 0.3.0. Use libssh2_channel_handle_extended_data2(). */
 #define libssh2_channel_ignore_extended_data(channel, ignore)                 \
     libssh2_channel_handle_extended_data((channel), (ignore) ?                \
                                        LIBSSH2_CHANNEL_EXTENDED_DATA_IGNORE : \
@@ -1004,7 +1035,7 @@ LIBSSH2_API int libssh2_channel_wait_closed(LIBSSH2_CHANNEL *channel);
 LIBSSH2_API int libssh2_channel_free(LIBSSH2_CHANNEL *channel);
 
 #ifndef LIBSSH2_NO_DEPRECATED
-/* libssh2_scp_recv is DEPRECATED, do not use! */
+LIBSSH2_DEPRECATED(1.7.0, "Use libssh2_scp_recv2()")
 LIBSSH2_API LIBSSH2_CHANNEL *libssh2_scp_recv(LIBSSH2_SESSION *session,
                                               const char *path,
                                               struct stat *sb);