--- a/contrib/debian/changelog	Sun Oct 18 12:00:36 2015 +0800
+++ b/contrib/debian/changelog	Sat Jan 30 23:38:43 2016 +0800
@@ -13,8 +13,9 @@
   * Improvements to the dict_dcca_* extensions.
   * Improved default CMake configuration.
   * Fixes for a few newer operating systems compatibility.
+  * Fixed default secure Diameter port number 5868 instead of5658 (errata of RFC 6733)
 
- -- Sebastien Decugis <sdecugis@freediameter.net>  Fri, 19 Jun 2015 01:19:16 +0800
+ -- Sebastien Decugis <sdecugis@freediameter.net>  Sat, 30 Jan 2016 23:38:03 +0800
 
 freediameter (1.2.0) UNRELEASED; urgency=low
 

--- a/doc/freediameter.conf.sample	Sun Oct 18 12:00:36 2015 +0800
+++ b/doc/freediameter.conf.sample	Sat Jan 30 23:38:43 2016 +0800
@@ -31,8 +31,8 @@
 # The port this peer is listening on for incoming TLS-protected connections (TCP and SCTP).
 # See TLS_old_method for more information about TLS flavours.
 # Note: we use TLS/SCTP instead of DTLS/SCTP at the moment. This will change in future version of freeDiameter.
-# Default: 5658. Use 0 to disable.
-#SecPort = 5658;
+# Default: 5868. Use 0 to disable.
+#SecPort = 5868;
 
 # Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed 
 # on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the 
@@ -237,7 +237,7 @@
 # Parameters that can be specified in the peer's parameter list:
 #  No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method;
 #  No_TLS;       # assume transparent security instead of TLS. DTLS is not supported yet (will change in future versions).
-#  Port = 5658;  # The port to connect to
+#  Port = 5868;  # The port to connect to
 #  TcTimer = 30;
 #  TwTimer = 30;
 #  ConnectTo = "202.249.37.5";

--- a/include/freeDiameter/libfdcore.h	Sun Oct 18 12:00:36 2015 +0800
+++ b/include/freeDiameter/libfdcore.h	Sat Jan 30 23:38:43 2016 +0800
@@ -127,7 +127,7 @@
 	unsigned int 	 cnf_timer_tw;	/* The value in seconds of the default Tw timer */
 	
 	uint16_t	 cnf_port;	/* the local port for legacy Diameter (default: 3868) in host byte order */
-	uint16_t	 cnf_port_tls;	/* the local port for Diameter/TLS (default: 5658) in host byte order */
+	uint16_t	 cnf_port_tls;	/* the local port for Diameter/TLS (default: 5868) in host byte order */
 	uint16_t	 cnf_port_3436; /* Open an additional server port to listen to old TLS/SCTP clients (RFC3436, freeDiameter versions < 1.2.0) */
 	uint16_t	 cnf_sctp_str;	/* default max number of streams for SCTP associations (def: 30) */
 	struct fd_list	 cnf_endpoints;	/* the local endpoints to bind the server to. list of struct fd_endpoint. default is empty (bind all). After servers are started, this is the actual list of endpoints including port information. */

--- a/include/freeDiameter/libfdproto.h	Sun Oct 18 12:00:36 2015 +0800
+++ b/include/freeDiameter/libfdproto.h	Sat Jan 30 23:38:43 2016 +0800
@@ -109,7 +109,7 @@
 /*============================================================*/
 
 #define DIAMETER_PORT		3868
-#define DIAMETER_SECURE_PORT	5658
+#define DIAMETER_SECURE_PORT	5868
 
 
 /*============================================================*/