diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 7c23a01b473..a237278bcd6 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -372,6 +372,12 @@ uniarp_ifaddr(sip)
 			 * This is what we're waiting for
 			 */
 			uniarp_client_mode(uip, NULL);
+		} else if (uip->uip_arpstate == UIAS_SERVER_ACTIVE) {
+			/*
+			 * Set new local arpserver atm address
+			 */
+			ATM_ADDR_SEL_COPY(&sip->si_addr, nip->nif_sel,
+						&uip->uip_arpsvratm);
 		}
 	}