diff --git a/Makefile b/Makefile
index 981c92f2a..0b57baf29 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ list:
 .endfor
 
 # shared targets that are sane to run from the root directory
-TARGETS=	clean glint lint plist-fix revision style style-fix style-model style-python sweep test
+TARGETS=	clean glint lint plist-fix revision style sweep test
 
 .for TARGET in ${TARGETS}
 ${TARGET}:
diff --git a/Mk/lint.mk b/Mk/lint.mk
index 6114383ba..ddc3c2ad7 100644
--- a/Mk/lint.mk
+++ b/Mk/lint.mk
@@ -24,8 +24,3 @@
 # SUCH DAMAGE.
 
 .-include "${PLUGINSDIR}/../core/Mk/lint.mk"
-
-lint-desc: check
-	@if [ ! -f ${.CURDIR}/${PLUGIN_DESC} ]; then \
-		echo ">>> Missing ${PLUGIN_DESC}"; exit 1; \
-	fi
diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index c9b297c36..cac2579b0 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 
 all: check
-	@cat ${.CURDIR}/pkg-descr | ${PAGER}
+	@cat ${.CURDIR}/${PLUGIN_DESC} | ${PAGER}
 
 .include "defaults.mk"
 
@@ -32,8 +32,6 @@ PLUGINSDIR?=		${.CURDIR}/../..
 SCRIPTSDIR=		${PLUGINSDIR}/Scripts
 TEMPLATESDIR=		${PLUGINSDIR}/Templates
 
-.include "lint.mk"
-
 .if exists(${GIT}) && exists(${GITVERSION})
 PLUGIN_COMMIT!=		${GITVERSION}
 .else
@@ -54,6 +52,8 @@ PLUGIN_REVISION?=	0
 PLUGIN_REQUIRES=	PLUGIN_NAME PLUGIN_VERSION PLUGIN_COMMENT \
 			PLUGIN_MAINTAINER
 
+.include "lint.mk"
+
 check:
 .for PLUGIN_REQUIRE in ${PLUGIN_REQUIRES}
 .  if "${${PLUGIN_REQUIRE}}" == ""
diff --git a/README.md b/README.md
index 171092c3d..6a421e8d2 100644
--- a/README.md
+++ b/README.md
@@ -150,9 +150,8 @@ The make targets for the root directory:
 * clean:	remove all changes and unknown files
 * lint:		run syntax checks
 * list:		print a list of all plugin directories with comments
-* style-fix:	apply style fixes
 * style:	run style checks
-* sweep:	apply whitespace fixes
+* sweep:	apply style fixes
 
 The make targets for any plugin directory:
 
@@ -163,6 +162,5 @@ The make targets for any plugin directory:
 * package:	creates a package
 * upgrade:	upgrades existing package
 * remove:	remove known files from target directory
-* style-fix:	apply style fixes
 * style:	run style checks
-* sweep:	apply whitespace fixes
+* sweep:	apply style fixes