--- unix-gcc.mak.orig	Thu Oct 15 22:07:48 1998
+++ unix-gcc.mak	Thu Oct 15 22:09:01 1998
@@ -188,6 +188,9 @@
 
 #XLIBDIRS=-L/usr/local/X/lib
 XLIBDIRS=-L/usr/X11/lib
+.if ${PORTOBJFORMAT} == "elf"
+XLIBDIRS+=-Wl,-rpath,${X11BASE}/lib
+.endif
 XLIBDIR=
 XLIBS=Xt Xext X11
 
@@ -4077,8 +4080,13 @@
 
 cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
 
+cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
+
 cdeskjet.dev: $(cdeskjet_) page.dev
 	$(SETPDEV) cdeskjet $(cdeskjet_)
+
+cdj850.dev: $(cdeskjet8_) page.dev
+	$(SETPDEV) cdj850 $(cdeskjet8_)
 
 cdjcolor.dev: $(cdeskjet_) page.dev
 	$(SETPDEV) cdjcolor $(cdeskjet_)
