diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index df213b966..990a6cfdd 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -37,6 +37,7 @@ Bugs fixed
 - Bug 2136 - The usage of tid in wifi and wave module shall be "if (tid > 7)" rather than "if (tid >= 7)"
 - Bug 2132 - TCP RST packets were incorrectly formatted if no endpoints matched
 - Bug 2138 - SimpleNetDevice could send overlapped packets
+- Bug 2148 - Ipv6Interface::SetUp doesn't re-create the Link-Local addresses
 - Bug 2153 - Incorrect power limits in wifi power control algorithms
 - Bug 2154 - Incorrect power calculation in wifi power adaptation examples
 - Bug 2156 - Duplicate packets when using two level aggregation
diff --git a/src/internet/model/ipv6-interface.cc b/src/internet/model/ipv6-interface.cc
index b277b227f..b9b7703fc 100644
--- a/src/internet/model/ipv6-interface.cc
+++ b/src/internet/model/ipv6-interface.cc
@@ -121,7 +121,7 @@ void Ipv6Interface::DoSetup ()
     {
       icmpv6 = proto->GetObject <Icmpv6L4Protocol> ();
     }
-  if (icmpv6)
+  if (icmpv6 && !m_ndCache)
     {
       m_ndCache = icmpv6->CreateCache (m_device, this);
     }
@@ -179,6 +179,7 @@ void Ipv6Interface::SetUp ()
     {
       return;
     }
+  DoSetup ();
   m_ifup = true;
 }