diff --git a/Changelog b/Changelog
index a0510fe..926fc25 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,8 @@
 [Changes 1.2c01]
 
+* configure - use the right dependencies when checking for net/if.h, i
+  arpa/inet.h and resolv.h. Reported by flashback. (caf)
+
 * Fix plugin Makefiles for out-of-tree building, reported by nyet. (caf)
 
 * Add DESTDIR support to build system, to ease rpm and deb packaging.
diff --git a/configure.in b/configure.in
index 3a15169..95327e3 100644
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,24 @@ AC_CHECK_LIB(m, pow, LIBS="-lm $LIBS",)
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(arpa/inet.h net/if.h sys/time.h sys/fcntl.h fcntl.h sys/file.h sys/syslimits.h netinet/in_systm.h sys/in_systm.h netdb.h sys/un.h sys/filio.h regex.h resolv.h arpa/nameser.h dirent.h sys/ndir.h sys/dir.h ndir.h)
+AC_CHECK_HEADERS([sys/socket.h sys/time.h sys/fcntl.h fcntl.h sys/file.h netinet/in.h netdb.h sys/un.h sys/filio.h regex.h arpa/nameser.h dirent.h sys/ndir.h sys/dir.h ndir.h])
+
+AC_CHECK_HEADERS([net/if.h], [], [],
+[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+])
+
+AC_CHECK_HEADERS([arpa/inet.h resolv.h], [], [],
+[AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+])
 
 dnl Checks for declarations.
 AC_CHECK_DECLARATION(stpcpy, stpcpy, stpcpy, string.h, STPCPY_DECLARED)
diff --git a/include/defs.h.in b/include/defs.h.in
index c438f84..3b43c3a 100644
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -159,8 +159,8 @@
 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
 
-/* Define to 1 if you have the <netinet/in_systm.h> header file. */
-#undef HAVE_NETINET_IN_SYSTM_H
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
 
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H
@@ -252,21 +252,18 @@
 /* Define to 1 if you have the <sys/filio.h> header file. */
 #undef HAVE_SYS_FILIO_H
 
-/* Define to 1 if you have the <sys/in_systm.h> header file. */
-#undef HAVE_SYS_IN_SYSTM_H
-
 /* Define to 1 if you have the <sys/ndir.h> header file. */
 #undef HAVE_SYS_NDIR_H
 
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
 /* Define to 1 if you have the <sys/soundcard.h> header file. */
 #undef HAVE_SYS_SOUNDCARD_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/syslimits.h> header file. */
-#undef HAVE_SYS_SYSLIMITS_H
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H