diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ada3e1a..5925a2e 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -437,6 +437,14 @@ int			tcp_keepalives_interval;
 int			tcp_keepalives_count;
 
 /*
+ * This is kept here for backwards compatibility only.
+ * SSL renegotiation has been removed in 9.5, but we tolerate it being set
+ * to zero to avoid breaking compatibility for clients that set it in
+ * order to disable renegotiation in older version.
+ */
+int			ssl_renegotiation_limit;
+
+/*
  * This really belongs in pg_shmem.c, but is defined here so that it doesn't
  * need to be duplicated in all the different implementations of pg_shmem.c.
  */
@@ -2571,6 +2579,17 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
+		{"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SECURITY,
+			gettext_noop("Exists for backwards compatibility only, must be 0"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE,
+		},
+		&ssl_renegotiation_limit,
+		0, 0, 0,
+		NULL, NULL, NULL
+	},
+
+	{
 		{"tcp_keepalives_count", PGC_USERSET, CLIENT_CONN_OTHER,
 			gettext_noop("Maximum number of TCP keepalive retransmits."),
 			gettext_noop("This controls the number of consecutive keepalive retransmits that can be "