diff --git a/net/lam/Makefile b/net/lam/Makefile
index 106f84306a9c..1376b68bea4f 100644
--- a/net/lam/Makefile
+++ b/net/lam/Makefile
@@ -372,12 +372,12 @@ MAN7=	LAM.7 \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386"
-PLIST_SUB+=	I386=""
-.else
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
 # Note: to enable TotalView on 64 bits platforms,
 # --enable-tv-dll-force should be added to CONFIGURE_ARGS
-PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	32BIT_ONLY="@comment "
+.else
+PLIST_SUB+=	32BIT_ONLY=""
 .endif
 
 pre-configure:
diff --git a/net/lam/pkg-plist b/net/lam/pkg-plist
index 083f01ee3c4c..4bb175d4b91e 100644
--- a/net/lam/pkg-plist
+++ b/net/lam/pkg-plist
@@ -89,9 +89,9 @@ include/mpi2cxx/win_inln.h
 include/mpicxx.h
 include/mpio.h
 include/mpiof.h
-%%I386%%lib/lam/liblam_totalview.la
-%%I386%%lib/lam/liblam_totalview.so
-%%I386%%lib/lam/liblam_totalview.so.0
+%%32BIT_ONLY%%lib/lam/liblam_totalview.la
+%%32BIT_ONLY%%lib/lam/liblam_totalview.so
+%%32BIT_ONLY%%lib/lam/liblam_totalview.so.0
 lib/liblam.a
 lib/liblam.la
 lib/liblammpi++.a
@@ -108,6 +108,6 @@ lib/libmpi.la
 %%DATADIR%%/doc/romio-users-guide.ps.gz
 %%DATADIR%%/mpi.share
 @dirrm include/mpi2cxx
-%%I386%%@dirrm lib/lam
+%%32BIT_ONLY%%@dirrm lib/lam
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%