diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 2f2845da0c04..27bd076650f8 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -5,7 +5,7 @@
 # Whom:				  Narvi <narvi@haldjas.folklore.ee>
 #				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.2 1997/07/17 15:12:57 max Exp $
+# $Id: Makefile,v 1.3 1998/01/07 11:11:48 obrien Exp $
 #
 
 DISTNAME=	socket++-1.10
@@ -25,7 +25,7 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
 post-install:
-	@${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libsocket++
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/libsocket++
diff --git a/net/libsocket++/pkg-plist b/net/libsocket++/pkg-plist
index 1abcbb5504e3..c905393255cf 100644
--- a/net/libsocket++/pkg-plist
+++ b/net/libsocket++/pkg-plist
@@ -1,8 +1,8 @@
 lib/libsocket++.a
 lib/libsocket++.so.1.10
 lib/libsocket++_p.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/Fork.h
 include/echo.h 
 include/ftp.h
@@ -12,6 +12,10 @@ include/smtp.h
 include/sockinet.h 
 include/sockstream.h 
 include/sockunix.h 
+@unexec install-info --delete %D/info/socket++.info %D/info/dir
 info/socket++.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/socket++.info %D/info/dir
 share/doc/libsocket++/README
 share/doc/libsocket++/socket++.ps
+@dirrm share/doc/libsocket++