diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index cffd1cd7849..e84bd5e8397 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2000/12/14 13:22:59 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/02/27 23:36:18 naddy Exp $
 
 PKGNAME=	conserver-5.21
 DISTFILES=	conserver-5.21-Beta.shar.gz
@@ -20,7 +20,7 @@ WRKDIST=	${WRKDIR}
 # Set this to where you want console(8) to connect to by default
 # or use something like ``make DEFAULTHOST=myserver.mydomain.net''
 DEFAULTHOST?=	localhost
-MAKE_ENV+=	DEFAULTHOST="${DEFAULTHOST}"
+MAKE_ENV+=	CC="${CC}" DEFAULTHOST="${DEFAULTHOST}"
 
 post-extract:
 	cp ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/comms/conserver/patches/patch-aa b/comms/conserver/patches/patch-aa
index 16af64af44e..6147ae2e92c 100644
--- a/comms/conserver/patches/patch-aa
+++ b/comms/conserver/patches/patch-aa
@@ -1,6 +1,7 @@
---- conserver/Makefile.orig	Sat Nov 22 20:42:18 1997
-+++ conserver/Makefile	Sat Nov 22 20:43:24 1997
-@@ -8,6 +8,6 @@
+--- conserver/Makefile.orig	Wed Feb 28 00:26:07 2001
++++ conserver/Makefile	Wed Feb 28 00:27:47 2001
+@@ -7,8 +7,8 @@
+ # (1) change ETC below to where you would like the console server installed
  # I would not change the name, you have to much with the docs then...
  PROG=	conserver
 -ETC=	${DESTDIR}/usr/local/etc
@@ -9,21 +10,31 @@
 +DOC=	${DESTDIR}/usr/local/man/man8
  
  # if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o
-@@ -25,5 +25,5 @@
- INCLUDE=
- DEBUG=-O
--CDEFS=  -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1
-+CDEFS=  -DOPENBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782
- CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
+ # and change the CDEFS line below to =0
+@@ -23,9 +23,9 @@
+ P=
  
-@@ -42,5 +42,5 @@
+ INCLUDE=
+-DEBUG=-O
+-CDEFS=  -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1
+-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
++DEBUG=
++CDEFS=  -DOPENBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782
++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
+ 
+ HDR=	cons.h \
+ 	access.h client.h consent.h group.h main.h master.h \
+@@ -41,7 +41,7 @@
+ all: ${PROG}
  
  ${PROG}:$P ${OBJ}
 -	${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl
 +	${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB}
  
  clean: FRC
-@@ -60,5 +60,6 @@
+ 	rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags
+@@ -59,7 +59,8 @@
+ 	distrib -c ${ETC}/${PROG}
  
  install: all dirs FRC
 -	install -c -s ${PROG} ${ETC}/${PROG}
@@ -31,3 +42,4 @@
 +	install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.8
  
  lint: ${HDR} ${SRC} FRC
+ 	lint -h ${CDEFS} ${INCLUDE} ${SRC}
diff --git a/comms/conserver/patches/patch-ae b/comms/conserver/patches/patch-ae
index e176aa9ba9c..68dcc0a4514 100644
--- a/comms/conserver/patches/patch-ae
+++ b/comms/conserver/patches/patch-ae
@@ -1,5 +1,5 @@
---- console/Makefile.orig	Sat Nov 22 23:02:48 1997
-+++ console/Makefile	Sat Nov 22 23:03:45 1997
+--- console/Makefile.orig	Wed Feb 28 00:26:03 2001
++++ console/Makefile	Wed Feb 28 00:28:19 2001
 @@ -6,8 +6,8 @@
  # edit the ETC directory below to change where the console client
  # is installed.
@@ -11,15 +11,19 @@
  
  I=/usr/include
  S=/usr/include/sys
-@@ -17,7 +17,7 @@
+@@ -16,9 +16,9 @@
+ P=
  
  INCLUDE= -I$C
- DEBUG=-O
+-DEBUG=-O
 -CDEFS=  -DSUN5
+-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
++DEBUG=
 +CDEFS=  -DOPENBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782
- CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
  
  HDR=	
+ ONEC=	console.c
 @@ -29,7 +29,7 @@
  all: ${PROG}