diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 2791ffc4aca6..84f1636fa074 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -14,17 +14,14 @@ LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 BROKEN=		No more public distfiles
 
-USES=		gmake pathfix gettext iconv pkgconfig
+USES=		gmake mono pathfix gettext iconv pkgconfig
 USE_GNOME=	gnomeprefix intltool gtksharp20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|.so.*"|.so"|g' ${WRKSRC}/cowbell.exe.config
 
-.include "${PORTSDIR}/lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/taglib-sharp/Makefile b/audio/taglib-sharp/Makefile
index 43baeb47d42d..7b8167309a75 100644
--- a/audio/taglib-sharp/Makefile
+++ b/audio/taglib-sharp/Makefile
@@ -9,19 +9,12 @@ MASTER_SITES=	http://download.banshee.fm/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Tagging library for the Mono framework
 
-LIB_PC_DEPENDS=	mono.pc:${PORTSDIR}/lang/mono
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|}
-
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake mono pathfix pkgconfig
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 		VERSIONSUFX="db62eba44689b5b0"
 
 CONFIGURE_ARGS=	--disable-docs
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/db4o-mono/Makefile b/databases/db4o-mono/Makefile
index d66be8ec8dcc..937108af5336 100644
--- a/databases/db4o-mono/Makefile
+++ b/databases/db4o-mono/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	A database engine for storing object into files
 
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
+USES=		mono
 
 REALVERSION=	5.5
 
@@ -34,6 +34,4 @@ post-install:
 	@${CHMOD} -R ugo-w,ugo+rX ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index e1aec997a0fa..36dfa37e3dd9 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/m
 		${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
 		mautil:${PORTSDIR}/devel/mono-addins
 
-USE_XZ=		yes
-USES=		gettext gmake pkgconfig
-USE_GNOME=	gnomehack intlhack gnomeprefix gnomedesktopsharp20
+USES=		gettext gmake mono pathfix pkgconfig tar:xz
+USE_GNOME=	intlhack gnomeprefix gnomedesktopsharp20
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
@@ -40,7 +39,7 @@ APPLET_DESC=	Enable GNOME panel applet
 PORTSCOUT=	limitw:1,even
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPPLET}
 CONFIGURE_ARGS+=--enable-panel-applet
@@ -60,5 +59,4 @@ post-patch:
 	@${REINPLACE_CMD} 's|gmime-sharp|gmime-sharp-2.4|g' \
 		${WRKSRC}/configure
 
-.include "${PORTSDIR}/lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index d80809a86f5b..74b4d4ec5ab0 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -13,13 +13,10 @@ COMMENT=	Mono interface to the D-BUS messaging system
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
-
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake mono pathfix pkgconfig
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 .if ${OSVERSION} < 1000044
@@ -33,5 +30,4 @@ post-patch:
 		${WRKSRC}/src/dbus-sharp.dll.config
 .endif
 
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/log4net/Makefile b/devel/log4net/Makefile
index 9bc219fff2f6..b07d15bcdbd2 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -12,12 +12,9 @@ DISTNAME=	incubating-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Port for .NET of the Apache Logging Services project
 
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
-
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		zip
+USES=		mono zip
 NO_BUILD=	yes
 
 SUB_FILES=	log4net.pc
@@ -45,5 +42,4 @@ do-install:
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index e23c5a372f65..e5996cfc30fb 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -9,10 +9,7 @@ COMMENT=	Mono framework to create extensible applications
 
 LICENSE=	MIT
 
-LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+USES=		mono
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mono
@@ -32,7 +29,6 @@ OPTIONS_DEFAULT=GTK2
 PLIST_SUB+=	VER=1.0.0
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtksharp20