--- Makefile	(revision 527876)
+++ Makefile	(working copy)
@@ -44,6 +44,7 @@ 
 OPTIONS_DEFINE_amd64=		AVX AVX2
 OPTIONS_DEFINE_powerpc64=	POWER6
 OPTIONS_EXCLUDE_powerpc64=	OPENMP
+OPTIONS_SUB=	yes
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
@@ -74,12 +75,6 @@ 
 MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
 .endif
 
-.if ${PORT_OPTIONS:MDYNAMIC_ARCH}
-PLIST_SUB+=	DYNARCH=""
-.else
-PLIST_SUB+=	DYNARCH="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MOPENMP}
 USES+=		compiler:openmp
 .else
--- pkg-plist	(revision 527876)
+++ pkg-plist	(working copy)
@@ -9,6 +9,6 @@ 
 lib/cmake/openblas/OpenBLASConfigVersion.cmake
 lib/libopenblas.a
 lib/libopenblas.so
-%%DYNARCH%%lib/libopenblasp-r%%PORTVERSION%%.a
-%%DYNARCH%%lib/libopenblasp-r%%PORTVERSION%%.so
+%%DYNAMIC_ARCH%%lib/libopenblasp-r%%PORTVERSION%%.a
+%%DYNAMIC_ARCH%%lib/libopenblasp-r%%PORTVERSION%%.so
 libdata/pkgconfig/openblas.pc