diff --git a/fonts/crimson/Makefile b/fonts/crimson/Makefile
index 9c359c9fb2b..52f9b9efdbb 100644
--- a/fonts/crimson/Makefile
+++ b/fonts/crimson/Makefile
@@ -1,24 +1,25 @@
-COMMENT=	oldstyle book font
+COMMENT-main =	oldstyle book font
+COMMENT-web =	oldstyle book font (web fonts)
+
+MULTI_PACKAGES =	-main -web
+
+MODFONT_FAMILY =	crimson
 
 GH_ACCOUNT=	skosch
 GH_PROJECT=	Crimson
 GH_TAGNAME=	fonts-october2014
-PKGNAME=	crimson-2014.10
+MODFONT_VERSION =	2014.10
+REVISION =	0
 
-CATEGORIES=	fonts
+MODULES =	font
 
 # SIL OFL 1.1
 PERMIT_PACKAGE=	Yes
 
-PKG_ARCH=	*
 NO_BUILD=	Yes
 NO_TEST=	Yes
 
-FONTSDIR=	${PREFIX}/share/fonts/crimson
-
-do-install:
-	${INSTALL_DATA_DIR} ${FONTSDIR}
-	cd "${WRKSRC}/Desktop Fonts/OTF"; \
-	    ${INSTALL_DATA} *.otf ${FONTSDIR}
+MODFONT_FONTFILES =	Desktop*Fonts/OTF/*.otf
+MODFONT_WEBFILES =	Web*Fonts/*.woff
 
 .include <bsd.port.mk>
diff --git a/fonts/crimson/distinfo b/fonts/crimson/distinfo
index c74f2e764ba..821f95780ac 100644
--- a/fonts/crimson/distinfo
+++ b/fonts/crimson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Crimson-fonts-october2014.tar.gz) = q9i/wk4b102G8X2RYEgmektWcS9OXcfS4zuhhWGG0WM=
-SIZE (Crimson-fonts-october2014.tar.gz) = 2315861
+SHA256 (Crimson-fonts-october2014.zip) = qygYfCrRX/7cQwYeRcGryV1YX3TPGrqgIBNPJTZvhYk=
+SIZE (Crimson-fonts-october2014.zip) = 2304387
diff --git a/fonts/crimson/pkg/DESCR b/fonts/crimson/pkg/DESCR-main
similarity index 100%
rename from fonts/crimson/pkg/DESCR
rename to fonts/crimson/pkg/DESCR-main
diff --git a/fonts/crimson/pkg/DESCR-web b/fonts/crimson/pkg/DESCR-web
new file mode 100644
index 00000000000..ca118fb30de
--- /dev/null
+++ b/fonts/crimson/pkg/DESCR-web
@@ -0,0 +1,15 @@
+Crimson is a free and open-source text type family.
+
+The font is designed in the tradition of beautiful oldstyle type,
+and inspired particularly by the fantastic work of people like Jan
+Tschichold (Sabon), Robert Slimbach (Arno, Minion) and Jonathan Hoefler
+(Hoefler Text). It features
+
+- six cuts (regular, semibold and bold; with a Roman and Italic each)
+
+- characters for a wide range of European languages - though some are
+still better supported than others between different cuts
+
+- spacing/kerning done by Igino Marini's spectacular iKern
+
+- an unbeatable price of zero!
diff --git a/fonts/crimson/pkg/PLIST b/fonts/crimson/pkg/PLIST-main
similarity index 100%
rename from fonts/crimson/pkg/PLIST
rename to fonts/crimson/pkg/PLIST-main
diff --git a/fonts/crimson/pkg/PLIST-web b/fonts/crimson/pkg/PLIST-web
new file mode 100644
index 00000000000..7b4adf3840e
--- /dev/null
+++ b/fonts/crimson/pkg/PLIST-web
@@ -0,0 +1,8 @@
+fonts/
+fonts/crimson/
+fonts/crimson/crimson-bold-webfont.woff
+fonts/crimson/crimson-bolditalic-webfont.woff
+fonts/crimson/crimson-italic-webfont.woff
+fonts/crimson/crimson-roman-webfont.woff
+fonts/crimson/crimson-semibold-webfont.woff
+fonts/crimson/crimson-semibolditalic-webfont.woff