diff --git a/debian/changelog b/debian/changelog
index 34605d5..574a5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+l2tpns (2.2.1.2fdn3.21) unstable; urgency=low
+
+  * Fix: mismatch variable type (cluster_port).
+
+ -- Fernando Alves <fendo@sameswifi.fr>  Sat, 27 May 2017 11:09:54 +0200
+
 l2tpns (2.2.1.2fdn3.20) unstable; urgency=low
 
   * Add cluster_port parameter for Multiple clusters (See clustering section for more informationc).
diff --git a/l2tpns.h b/l2tpns.h
index 86cb664..69a91c2 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -731,7 +731,7 @@ typedef struct
 	char		epdis_addr[20];			// MP Endpoint Discriminator address
 
 	in_addr_t	cluster_address;		// Multicast address of cluster.
-	unsigned short	cluster_port;			// UDP port of cluster.
+	int			cluster_port;			// UDP port of cluster.
 							// Send to this address to have everyone hear.
 	char		cluster_interface[64];		// Which interface to listen for multicast on.
 	int		cluster_iam_master;		// Are we the cluster master???