--- conf/mhconfig.c.org	Wed Oct  7 17:00:15 1998
+++ conf/mhconfig.c	Wed Oct  7 17:00:49 1998
@@ -32,7 +32,9 @@
 #define	MHRELEASE	"6.8.4"		/* for version: "Maj.min.pat" */
 #define	MHCENTERFOOT	"MH.6.8"	/* for nroff page footers */
 #define	MHLEFTFOOT	"[mh.6]"	/* [mh.6]    MH.6.6   page# */
+#ifndef MHSLIBVER
 #define	MHSLIBVER	"3.2"		/* Shared library version */
+#endif
 
 #define	NOTOK	(-1)
 
--- conf/makefiles/sbr.org	Wed Oct  7 17:26:19 1998
+++ conf/makefiles/sbr	Wed Oct  7 17:27:13 1998
@@ -140,7 +140,11 @@
 		(cd shared; ld -G -o ../$@ -h $@.$(SLIBVER) $(OFILES))
 @END: SYS5SHLIB
 @BEGIN: FBSDSHLIB
+.if ${PORTOBJFORMAT} == "elf"
+		(cd shared; cc -shared -o ../$@ $(OFILES))
+.else
 		(cd shared; ld -Bshareable -o ../$@ $(OFILES))
+.endif
 @END: FBSDSHLIB
 		-@rm -f $@.$(SLIBVER)
 		ln $@ $@.$(SLIBVER)
@@ -175,6 +179,7 @@
 inst-lib:	libmh.so $(LIBSA)
 		-rm -f $(SLIBDIR)/libmh.so.$(SLIBVER)
 		cp libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
+		ln -s libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so
 		-@chmod $(PGMPROT) $(SLIBDIR)/libmh.so.$(SLIBVER)
 		-@ls -l $(SLIBDIR)/libmh.so.*
 		-@echo "Shared library installed normally"
--- conf/Makefile.org	Wed Oct  7 17:03:42 1998
+++ conf/Makefile	Wed Oct  7 17:04:34 1998
@@ -6,7 +6,11 @@
 SHELL	=	/bin/sh
 
 CC      =   	cc
-CFLAGS  =   	-O
+.if ${PORTOBJFORMAT} == "elf"
+CFLAGS  =	-O -DMHSLIBVER=\"3\"
+.else
+CFLAGS  =	-O -DMHSLIBVER=\"3.2\"
+.endif
 LFLAGS  =   	-bhu
 LDFLAGS =
 LIBES   =
--- conf/makefiles/uip.org	Wed Oct  7 18:38:09 1998
+++ conf/makefiles/uip	Wed Oct  7 18:39:03 1998
@@ -127,7 +127,7 @@
 LD	=	@(MHCOMPILER)
 @END: STDLIB
 @BEGIN: SHAREDLIB
-LD	=	LD_LIBRARY_PATH=../sbr @(MHCOMPILER)
+LD	=	LD_LIBRARY_PATH=../sbr @(MHCOMPILER) -L../sbr
 @END: SHAREDLIB
 @BEGIN: OPTIM
 CFLAGS	=	$(OPTIONS)
--- conf/makefiles/support/pop.org	Wed Oct  7 18:47:55 1998
+++ conf/makefiles/support/pop	Wed Oct  7 18:48:20 1998
@@ -38,7 +38,7 @@
 LD	=	@(MHCOMPILER)
 @END: STDLIB
 @BEGIN: SHAREDLIB
-LD	=	LD_LIBRARY_PATH=../../sbr @(MHCOMPILER)
+LD	=	LD_LIBRARY_PATH=../../sbr @(MHCOMPILER) -L../../sbr
 @END: SHAREDLIB
 @BEGIN: OPTIM
 CFLAGS  =	$(OPTIONS)
