diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index c01e1c7..7a17208 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -174,10 +174,6 @@
 void EthernetInterface::addAddr(const AddressInfo& info)
 {
     IP::AddressOrigin origin = IP::AddressOrigin::Static;
-    if (dhcpIsEnabled(info.ifaddr.getAddr()))
-    {
-        origin = IP::AddressOrigin::DHCP;
-    }
 #ifdef LINK_LOCAL_AUTOCONFIGURATION
     if (info.scope == RT_SCOPE_LINK)
     {
@@ -185,6 +181,22 @@
     }
 #endif
 
+    if ((info.scope == RT_SCOPE_UNIVERSE) && (info.flags & IFA_F_PERMANENT))
+    {
+        origin = IP::AddressOrigin::Static;
+    }
+    if ((info.scope == RT_SCOPE_UNIVERSE) &&
+        ((info.flags & IFA_F_NOPREFIXROUTE) &&
+         (info.flags & IFA_F_MANAGETEMPADDR)))
+    {
+        origin = IP::AddressOrigin::SLAAC;
+    }
+    else if ((info.scope == RT_SCOPE_UNIVERSE) &&
+             ((info.flags & IFA_F_NOPREFIXROUTE)))
+    {
+        origin = IP::AddressOrigin::DHCP;
+    }
+
     auto it = addrs.find(info.ifaddr);
     if (it == addrs.end())
     {