diff --git a/plugins/forkptyrouter/forkptyrouter.c b/plugins/forkptyrouter/forkptyrouter.c
index 88ca3d90..01f2918e 100644
--- a/plugins/forkptyrouter/forkptyrouter.c
+++ b/plugins/forkptyrouter/forkptyrouter.c
@@ -23,7 +23,7 @@ extern struct uwsgi_server uwsgi;
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
 #include <libutil.h>
 #endif
-#if !defined(__FreeBSD__) || !defined(__DragonFly__)
+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
 #include <utmp.h>
 #endif
 
diff --git a/plugins/pty/pty.c b/plugins/pty/pty.c
index a90965d5..db74b3a6 100644
--- a/plugins/pty/pty.c
+++ b/plugins/pty/pty.c
@@ -1,12 +1,12 @@
 #include <uwsgi.h>
-#if defined(__linux__) || defined(__GNU_kFreeBSD__)
+#if defined(__linux__) || defined(__GNU_kFreeBSD__) || defined(__HURD__)
 #include <pty.h>
 #elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #include <util.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 #include <libutil.h>
 #endif
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
 #include <utmp.h>
 #endif
 
diff --git a/plugins/pty/uwsgiplugin.py b/plugins/pty/uwsgiplugin.py
index a4aba6c8..dbc2b23f 100644
--- a/plugins/pty/uwsgiplugin.py
+++ b/plugins/pty/uwsgiplugin.py
@@ -5,7 +5,7 @@ uwsgi_os = os.uname()[0]
 
 CFLAGS = []
 LDFLAGS = []
-if uwsgi_os in ('Linux', 'FreeBSD'):
+if uwsgi_os in ('Linux', 'FreeBSD', 'GNU', 'NetBSD', 'DragonFly'):
     LIBS = ['-lutil']
 else:
     LIBS = []