diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index d2b9e9482371..705a3e005d68 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -6,7 +6,6 @@ INCS=	dialog.h
 MAN=	dialog.3
 
 SHLIB_MAJOR= 4
-SHLIB_MINOR= 0
 SRCS=   kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \
 	lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \
 	fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 264d5ffe38a3..b6a47998eb2a 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -6,7 +6,6 @@ SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
 LIB=		g2c
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 
 # Traditional FORTRAN Library members defined in libF77
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 4a6adf6080bf..91faed8c56fd 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -11,7 +11,6 @@ LIB=	gcc
 .endif
 
 #SHLIB_MAJOR=	1
-#SHLIB_MINOR=	0
 
 #
 # XXX This is a hack, but it seems to work.
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 84be5d445390..10145d18e833 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 SHLIB_MAJOR= 4
-SHLIB_MINOR= 2
 RL_LIBRARY_VERSION= 4.2
 
 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index d351027a8d09..54bd957a2b52 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -4,7 +4,6 @@ SUBDIR+= doc
 
 LIB=		gnuregex
 SHLIB_MAJOR=	2
-SHLIB_MINOR=	0
 
 SRCS=	regex.c
 INCS=	regex.h
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index e76ec3aa79fc..bbb19d429e7c 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -13,7 +13,6 @@ SUPDIR=	${SRCDIR}/libsupc++
 LIB=		stdc++
 .if ${MACHINE_ARCH} != "sparc64"
 SHLIB_MAJOR=	4
-SHLIB_MINOR=	0
 .endif
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index 0232da81ad46..2d68cd87de5c 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 SHLIB_MAJOR?=	6
-SHLIB_MINOR?=	0
 
 .include "../Makefile.inc"
diff --git a/kerberosIV/lib/Makefile.inc b/kerberosIV/lib/Makefile.inc
index acd5059dc437..7b0f08c3e34b 100644
--- a/kerberosIV/lib/Makefile.inc
+++ b/kerberosIV/lib/Makefile.inc
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 SHLIB_MAJOR?=	3
-SHLIB_MINOR?=	0
 
 .include "../Makefile.inc"
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 62677fda48f3..a7e1d21b7f2f 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
+# $FreeBSD$
 # Default version for system libs (override in <lib>/Makefile if necessary)
 SHLIB_MAJOR?= 2
-SHLIB_MINOR?= 0
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index a6f577d11261..0fcc8bf5a1d5 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		alias
 SHLIB_MAJOR=	4
-SHLIB_MINOR=	0
 CFLAGS+=	-Wall -Wmissing-prototypes
 SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 		alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index f412d418e2f1..dcdc7be2829a 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -7,7 +7,6 @@ BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 
 LIB=		bz2
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 SRCS=		bzlib.c blocksort.c compress.c crctable.c decompress.c \
 		huffman.c randtable.c
 INCS=		bzlib.h
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index dbe6734ab620..59e3578bf6ee 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -10,7 +10,6 @@
 # system call stubs.
 LIB=c
 SHLIB_MAJOR= 5
-SHLIB_MINOR= 0
 CFLAGS+=-DLIBC_MAJOR=${SHLIB_MAJOR}
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 AINC=	-I${.CURDIR}/${MACHINE_ARCH}
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index efbd364235ba..b641b9b6764e 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -9,7 +9,6 @@
 # system call stubs.
 LIB=c_r
 SHLIB_MAJOR= 5
-SHLIB_MINOR= 0
 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \
 	-I${.CURDIR}/../../include
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 1e155172f2e5..5d484bfaad6d 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -4,7 +4,6 @@ MAINTAINER=ken@FreeBSD.ORG
 
 LIB=	devstat
 SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
 SRCS=	devstat.c
 INCS=	devstat.h
 
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 0333e80bcfa0..b4a0bbfe9917 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -4,7 +4,6 @@
 
 LIB=	edit
 SHLIB_MAJOR=	4
-SHLIB_MINOR=	0
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index a00e8fcef1a0..f41cb90c863e 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -20,7 +20,6 @@ LDADD=		-lssl -lcrypto
 NO_WERROR=	yes
 
 SHLIB_MAJOR=    3
-SHLIB_MINOR=	0
 
 ftperr.h: ftp.errors
 	@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index a06a75e9f060..4cce5d8f9b73 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		ftpio
 SHLIB_MAJOR=	5
-SHLIB_MINOR=	0
 
 SRCS=		ftpio.c ftperr.c
 INCS=		ftpio.h
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 0f191a4ad984..23a10cceeaca 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -28,7 +28,6 @@
 
 LIB=	ipsec
 SHLIB_MAJOR= 1
-SHLIB_MINOR= 0
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
 .if !defined(NOINET6)
diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile
index 3733343ec512..19fe76af3c9b 100644
--- a/lib/libisc/Makefile
+++ b/lib/libisc/Makefile
@@ -4,7 +4,6 @@ BIND_DIR=	${.CURDIR}/../../contrib/bind
 
 LIB=		isc
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 
 .PATH:		${BIND_DIR}/lib/isc
 SRCS=		assertions.c ev_connects.c ev_files.c ev_streams.c \
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index a250757a567f..08a1bfb68401 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -9,7 +9,6 @@
 # system call stubs.
 LIB=pthread
 SHLIB_MAJOR= 5
-SHLIB_MINOR= 0
 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index 39a0708e28ed..1896dbe3d142 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -5,7 +5,6 @@ NCPLIB=${.CURDIR}
 LIB=		ncp
 
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 
 NOMAN=
 
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 396382dfdfa8..b757bc133c72 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -4,7 +4,6 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
 SHLIB_MAJOR=5
-SHLIB_MINOR=0
 
 # Should be elsewhere
 AWK?=	awk
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index bad5679976f3..227da194708a 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -6,7 +6,6 @@ WARNS?=		2
 MAN=		netgraph.3
 
 SHLIB_MAJOR=	1
-#SHLIB_MINOR=	1
 
 SRCS=		sock.c msg.c debug.c
 INCS=		netgraph.h
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 89e07a59e62a..37fd4e6af7b8 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -5,7 +5,6 @@
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
 SHLIB_MAJOR=    2
-SHLIB_MINOR=    1
 
 KEYFILE?=	\"/etc/opiekeys\"
 
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index bde061c1f319..a0b4860346b9 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -25,5 +25,4 @@
 #	$FreeBSD$
 
 SHLIB_MAJOR=	2
-SHLIB_MINOR=	0
 
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index b87bb9b980c6..0b8491152172 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -16,7 +16,6 @@ CFLAGS+=-DINET6
 .endif
 
 SHLIB_MAJOR=2
-SHLIB_MINOR=5
 
 #
 # Magic to grab sources out of src/contrib
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index a250757a567f..08a1bfb68401 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -9,7 +9,6 @@
 # system call stubs.
 LIB=pthread
 SHLIB_MAJOR= 5
-SHLIB_MINOR= 0
 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index fa8592fae2da..708a19c6d850 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -31,7 +31,6 @@ CFLAGS+=	-Wall
 DPADD+=		${LIBMD}
 LDADD+=		-lmd
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 MAN=		libradius.3 radius.conf.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index 5d4b3e27a552..7f01a6084359 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -3,7 +3,6 @@
 LIB=		smb
 
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 
 NOMAN=
 
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index e7b158fc424e..13da2e23eff7 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -31,7 +31,6 @@ CFLAGS+=	-Wall
 DPADD+=		${LIBMD}
 LDADD+=		-lmd
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 MAN=		libtacplus.3 tacplus.conf.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 6cd47fcc9c3e..51dfeb9da1e1 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		ugidfw
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
 SRCS=		ugidfw.c
 INCS=		ugidfw.h
 
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 8222bee0652d..79cc2f6e6671 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -7,7 +7,6 @@ LIB=	usbhid
 MAN=	usbhid.3
 
 SHLIB_MAJOR= 0
-SHLIB_MINOR= 0
 
 MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
 	usbhid.3 hid_dispose_report_desc.3 \
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index a3b74a7f0772..76c40bcba74e 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -3,7 +3,6 @@
 
 LIB=	util
 SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 CFLAGS+=-DINET6
 SRCS=	_secure_path.c auth.c fparseln.c login.c login_auth.c \
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 2fa1a88f27d6..227ad7ac48f0 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 LIB=	vgl
 SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
 CFLAGS+=-Wall -I${.CURDIR}
 SRCS=	main.c simple.c bitmap.c text.c mouse.c keyboard.c
 INCS=	vgl.h
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 830471089c21..cf414a18cd9f 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -6,7 +6,6 @@ MAINTAINER=markm@FreeBSD.org
 
 LIB=	wrap
 SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
 INCS=	tcpd.h
 MAN=	hosts_access.3
 MAN+=	hosts_access.5 hosts_options.5
diff --git a/lib/libxpg4/Makefile b/lib/libxpg4/Makefile
index 07453c82d135..8d05099ee5b8 100644
--- a/lib/libxpg4/Makefile
+++ b/lib/libxpg4/Makefile
@@ -2,7 +2,6 @@
 
 LIB=    xpg4
 SHLIB_MAJOR=    3
-SHLIB_MINOR=	0
 
 SRCS=	fakelib.c
 
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 9aa41548de20..27266b82b0e9 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		y
 SHLIB_MAJOR=	2
-SHLIB_MINOR=	0
 
 SRCS=	main.c yyerror.c
 
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 4af3bc8f95ae..a069c554d424 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -2,7 +2,6 @@
 
 LIB		 = ypclnt
 SHLIB_MAJOR	 = 1
-SHLIB_MINOR	 = 0
 SRCS		 =
 SRCS		+= ypclnt_connect.c
 SRCS		+= ypclnt_error.c
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 396382dfdfa8..b757bc133c72 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -4,7 +4,6 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
 SHLIB_MAJOR=5
-SHLIB_MINOR=0
 
 # Should be elsewhere
 AWK?=	awk
diff --git a/sys/netinet/libalias/Makefile b/sys/netinet/libalias/Makefile
index a6f577d11261..0fcc8bf5a1d5 100644
--- a/sys/netinet/libalias/Makefile
+++ b/sys/netinet/libalias/Makefile
@@ -2,7 +2,6 @@
 
 LIB=		alias
 SHLIB_MAJOR=	4
-SHLIB_MINOR=	0
 CFLAGS+=	-Wall -Wmissing-prototypes
 SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 		alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c \