diff --git a/server/core/server.c b/server/core/server.c
index 425089d93..9455adb94 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -32,6 +32,7 @@
  * 26/06/14	Mark Riddoch		Addition of server parameters
  * 30/08/14	Massimiliano Pinto	Addition of new service status description 
  * 30/10/14	Massimiliano Pinto	Addition of SERVER_MASTER_STICKINESS description
+ * 01/06/15	Massimiliano Pinto	Addition of server_update_address/port
  *
  * @endverbatim
  */
@@ -731,3 +732,41 @@ int		*data;
 
 	return set;
 }
+
+/*
+ * Update the address value of a specific server
+ *
+ * @param server        The server to update
+ * @param address      	The new address
+ *
+ */
+void
+server_update_address(SERVER *server, char *address)
+{
+	spinlock_acquire(&server_spin);
+	if (server && address) {
+		if (server->name) {
+			free(server->name);
+		}
+		server->name = strdup(address);
+	}
+	spinlock_release(&server_spin);
+}
+
+/*
+ * Update the port value of a specific server
+ *
+ * @param server        The server to update
+ * @param port      	The new port value
+ *
+ */
+void
+server_update_port(SERVER *server, unsigned short port)
+{
+	spinlock_acquire(&server_spin);
+	if (server && port > 0) {
+	        server->port = port;
+	}
+	spinlock_release(&server_spin);
+}
+
diff --git a/server/include/server.h b/server/include/server.h
index 734f30365..28011927f 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -43,6 +43,7 @@
  * 30/08/14	Massimiliano Pinto	Addition of SERVER_STALE_STATUS
  * 27/10/14	Massimiliano Pinto	Addition of SERVER_MASTER_STICKINESS
  * 19/02/15	Mark Riddoch		Addition of serverGetList
+ * 01/06/15	Massimiliano Pinto	Addition of server_update_address/port
  *
  * @endverbatim
  */
@@ -189,5 +190,7 @@ extern void	serverAddParameter(SERVER *, char *, char *);
 extern char	*serverGetParameter(SERVER *, char *);
 extern void	server_update(SERVER *, char *, char *, char *);
 extern void     server_set_unique_name(SERVER *, char *);
+extern void	server_update_address(SERVER *, char *);
+extern void	server_update_port(SERVER *,  unsigned short);
 extern RESULTSET	*serverGetList();
 #endif