diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile
index 3556683c717e..36ec085643ac 100644
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@@ -22,15 +22,10 @@ MAN3=d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
      d_recwrite.3 d_setfiles.3
 MAN1=ddlp.1
 
-.include <bsd.port.pre.mk>
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/typhoon
 	@${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon
 	@${INSTALL_DATA} ${WRKSRC}/include/environ.h ${WRKSRC}/include/typhoon.h ${PREFIX}/include
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtyphoon.so.1.10 ${PREFIX}/lib/libtyphoon.so
-.endif
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/typhoon/pkg-descr b/databases/typhoon/pkg-descr
index f6ef403fb84b..6dcfcf0e2c84 100644
--- a/databases/typhoon/pkg-descr
+++ b/databases/typhoon/pkg-descr
@@ -8,4 +8,3 @@ The system was originally inspired by Raima's db_VISTA (today Raima Data
 Manager) but is relational rather than network based. Typhoon lacks some of
 db_VISTA's features, but also contains a number of nice features not found in 
 db_VISTA.
-
diff --git a/databases/typhoon/pkg-plist b/databases/typhoon/pkg-plist
index 7fadbfdb269a..d8672ad5152f 100644
--- a/databases/typhoon/pkg-plist
+++ b/databases/typhoon/pkg-plist
@@ -6,8 +6,8 @@ include/environ.h
 include/typhoon.h
 lib/libtyphoon.a
 lib/libtyphoon.so
-lib/libtyphoon.so.1.10
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/libtyphoon.so.1
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
 share/typhoon/manual.asc
 @dirrm share/typhoon