diff --git a/math/cmlib/Makefile b/math/cmlib/Makefile
index 5f14897a5a1d..2feafb5c4e11 100644
--- a/math/cmlib/Makefile
+++ b/math/cmlib/Makefile
@@ -17,15 +17,16 @@ COMMENT=	NIST Core math library (CMLIB)
 
 USES=		fortran uidfix
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}
 SHLIB_MAJOR=	1
 
 LDFLAGS+=	${FFLAGS}
 LDADD ?=	-lgfortran -lm
 SRCCONF=	/dev/null
-MAKE_ENV+=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
+MAKE_ENV=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 
+NO_WRKSUBDIR=	yes
+
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index b6dcde6782ee..33a90a0ed44b 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -16,9 +16,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_XORG=	x11 xbitmaps xorgproto
 CFLAGS+=	-w -Wno-return-type
-WRKSRC=		${WRKDIR}
 ALL_TARGET=	xppaut
 
+NO_WRKSUBDIR=	yes
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_MAKE_ENV_OFF=	NOPORTDOCS=yes