diff --git a/CMakeLists.txt b/CMakeLists.txt
index b01a1eae7..9563631cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -638,7 +638,6 @@ elseif(FreeBSD)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
         src/common/networking/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
@@ -718,11 +717,13 @@ elseif(FreeBSD)
     )
     if(DragonFly)
         list(APPEND LIBFASTFETCH_SRC
+            src/common/netif/netif_obsd.c
             src/detection/bluetooth/bluetooth_nosupport.c
             src/detection/wifi/wifi_nosupport.c
         )
     else()
         list(APPEND LIBFASTFETCH_SRC
+            src/common/netif/netif_bsd.c
             src/detection/bluetooth/bluetooth_bsd.c
             src/detection/wifi/wifi_bsd.c
         )
@@ -813,7 +814,7 @@ elseif(OpenBSD)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
+        src/common/netif/netif_obsd.c
         src/common/networking/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
diff --git a/src/common/netif/netif_bsd.c b/src/common/netif/netif_bsd.c
index 8bdb22eef..52c4750ae 100644
--- a/src/common/netif/netif_bsd.c
+++ b/src/common/netif/netif_bsd.c
@@ -9,20 +9,12 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#if defined(__OpenBSD__) || defined(__DragonFly__)
-    #include <sys/sysctl.h>
-#endif
-
 #define ROUNDUP2(a, n)       ((a) > 0 ? (1 + (((a) - 1U) | ((n) - 1))) : (n))
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
 # define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
 #elif defined(__NetBSD__)
 # define ROUNDUP(a)           ROUNDUP2((a), sizeof(uint64_t))
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
-#elif defined(__OpenBSD__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
 #elif defined(__sun)
 # define ROUNDUP(a)           ROUNDUP2((a), _SS_ALIGNSIZE)
 #else
@@ -55,45 +47,6 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
     if (preferredSourceAddr)
         *preferredSourceAddr = 0;
 
-    #if defined(__OpenBSD__) || defined(__DragonFly__)
-    int mib[6] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_GATEWAY};
-    size_t needed;
-
-    if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-        return false;
-
-    FF_AUTO_FREE char* buf = malloc(needed);
-
-    if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
-        return false;
-
-    char* lim = buf + needed;
-    struct rt_msghdr* rtm;
-    for (char* next = buf; next < lim; next += rtm->rtm_msglen)
-    {
-        rtm = (struct rt_msghdr *)next;
-        struct sockaddr* sa = (struct sockaddr *)(rtm + 1);
-
-        if ((rtm->rtm_flags & RTF_GATEWAY) && (sa->sa_family == AF_INET))
-        {
-            struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(rtm, RTA_IFP);
-            if (sdl->sdl_family == AF_LINK)
-            {
-                assert(sdl->sdl_nlen <= IF_NAMESIZE);
-                memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
-                iface[sdl->sdl_nlen] = '\0';
-                *ifIndex = sdl->sdl_index;
-
-                // Get the preferred source address
-                struct sockaddr_in* src = (struct sockaddr_in*)get_rt_address(rtm, RTA_IFA);
-                if (preferredSourceAddr && src && src->sin_family == AF_INET)
-                    *preferredSourceAddr = src->sin_addr.s_addr;
-
-                return true;
-            }
-        }
-    }
-    #else
     //https://github.com/hashPirate/copenheimer-masscan-fork/blob/36f1ed9f7b751a7dccd5ed27874e2e703db7d481/src/rawsock-getif.c#L104
 
     FF_AUTO_CLOSE_FD int pfRoute = socket(PF_ROUTE, SOCK_RAW, AF_INET);
@@ -159,7 +112,6 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex,
             return false;
         }
     }
-    #endif
 
     return false;
 }
diff --git a/src/common/netif/netif_obsd.c b/src/common/netif/netif_obsd.c
new file mode 100644
index 000000000..c2224e16e
--- /dev/null
+++ b/src/common/netif/netif_obsd.c
@@ -0,0 +1,82 @@
+#include "netif.h"
+
+#include "common/io/io.h"
+#include "util/mallocHelper.h"
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+
+#define ROUNDUP2(a, n)       ((a) > 0 ? (1 + (((a) - 1U) | ((n) - 1))) : (n))
+
+#if defined(__OpenBSD__) || defined(__DragonFly__)
+# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
+#else
+# error unknown platform
+#endif
+
+static struct sockaddr *
+get_rt_address(struct rt_msghdr *rtm, int desired)
+{
+    struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
+
+    for (int i = 0; i < RTAX_MAX; i++)
+    {
+        if (rtm->rtm_addrs & (1 << i))
+        {
+            if ((1 << i) == desired)
+                return sa;
+            sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
+        }
+    }
+    return NULL;
+}
+
+bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex, uint32_t* preferredSourceAddr)
+{
+    if (preferredSourceAddr)
+        *preferredSourceAddr = 0;
+
+    int mib[6] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_GATEWAY};
+    size_t needed;
+
+    if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+        return false;
+
+    FF_AUTO_FREE char* buf = malloc(needed);
+
+    if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+        return false;
+
+    char* lim = buf + needed;
+    struct rt_msghdr* rtm;
+    for (char* next = buf; next < lim; next += rtm->rtm_msglen)
+    {
+        rtm = (struct rt_msghdr *)next;
+        struct sockaddr* sa = (struct sockaddr *)(rtm + 1);
+
+        if ((rtm->rtm_flags & RTF_GATEWAY) && (sa->sa_family == AF_INET))
+        {
+            struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(rtm, RTA_IFP);
+            if (sdl->sdl_family == AF_LINK)
+            {
+                assert(sdl->sdl_nlen <= IF_NAMESIZE);
+                memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
+                iface[sdl->sdl_nlen] = '\0';
+                *ifIndex = sdl->sdl_index;
+
+                // Get the preferred source address
+                struct sockaddr_in* src = (struct sockaddr_in*)get_rt_address(rtm, RTA_IFA);
+                if (preferredSourceAddr && src && src->sin_family == AF_INET)
+                    *preferredSourceAddr = src->sin_addr.s_addr;
+
+                return true;
+            }
+        }
+    }
+
+    return false;
+}