diff --git a/Makefile.dist b/Makefile.dist
index fdf6cbac..14dfbfd2 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -151,6 +151,21 @@ VARDB = /var/db
 #CATMANPAGES=
 ##--sco--
 
+## QNX
+##++qnx++
+#CF = cf/qnx.h
+#ADMMANDIR = /usr/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /usr/man/man5
+#FFMANEXT = .5
+#VARRUN = /etc
+#COPTS=-w3 -Dlint
+#LFLAGS=$(DEBUG) "-Wl,op symfile"
+#MANINSTALL = /bin/true 
+#INSTALL = cp
+#BINDIR = /etc
+##--qnx--
+
 CSRC   = options.c errwarn.c convert.c \
 	 tree.c memory.c alloc.c print.c hash.c tables.c inet.c \
 	 dispatch.c bpf.c packet.c raw.c nit.c socket.c
@@ -202,14 +217,14 @@ dhcpd.conf.cat5:	dhcpd.conf.5
 	nroff -man dhcpd.conf.5 >dhcpd.conf.cat5
 
 dhcpd:	$(OBJS) $(COBJ)
-	$(CC) -o dhcpd $(OBJS) $(COBJ) $(LIBS)
+	$(CC) $(LFLAGS) -o dhcpd $(OBJS) $(COBJ) $(LIBS)
 
 dhclient:	dhclient.o $(COBJ)
-	$(CC) -o dhclient dhclient.o $(COBJ) $(LIBS)
+	$(CC) $(LFLAGS) -o dhclient dhclient.o $(COBJ) $(LIBS)
 
 dhcpxlt:	dhcpxlt.o errwarn.o convert.o tables.o inet.o xconflex.o \
 		hash.o alloc.o
-	$(CC) -o dhcpxlt \
+	$(CC) $(LFLAGS) -o dhcpxlt \
 		dhcpxlt.o errwarn.o convert.o tables.o inet.o xconflex.o \
 		hash.o alloc.o \
 		$(LIBS)
diff --git a/configure b/configure
index 0e43230f..3d18834f 100755
--- a/configure
+++ b/configure
@@ -28,6 +28,8 @@ if [ "$sysname" = "" ]; then
       sysname=freebsd;;
     hpux)
       sysname=hpux;;
+    QNX)
+      sysname=qnx;;
   esac
 fi
 
@@ -47,6 +49,7 @@ if [ "$sysname" = "" ]; then
   echo "   netbsd	NetBSD 1.1 or higher"
   echo "   freebsd	FreeBSD"
   echo "   hpux		HP-UX"
+  echo "   qnx		QNX 4.2 or higher"
   exit 1;
 fi