diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 6b662141e4ee..5e29b811f06a 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -15,20 +15,20 @@ COMMENT=	A simple password-checking interface
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup
-RESTRICTED=	"Unsure of djb's license"
+RESTRICTED=	Unsure of djb's license
 
 PLIST_FILES=	bin/checkpassword
 PORTDOCS=	CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 
 do-configure:
-	${ECHO_CMD} 'cc -s -lcrypt' > ${WRKSRC}/conf-ld
-	${ECHO_CMD} ${PREFIX} >${WRKSRC}/conf-home
+	@${ECHO_CMD} '${CC} ${CFLAGS} -s -lcrypt' > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} ${PREFIX} >${WRKSRC}/conf-home
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif