diff --git a/devel/libnsutils/Makefile b/devel/libnsutils/Makefile
index b3654e6a32ec..bf74bdd28b97 100644
--- a/devel/libnsutils/Makefile
+++ b/devel/libnsutils/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libnsutils
 PORTVERSION=	0.0.5
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	NetSurf generalised utility library
@@ -20,8 +20,6 @@ USE_LDCONFIG=	yes
 
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-install:
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
index ef763d6123ca..57bfd4017f01 100644
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libparserutils
 PORTVERSION=	0.2.4
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Lexer/parser utility functions for NetSurf
@@ -21,8 +21,6 @@ USE_LDCONFIG=	yes
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 LDFLAGS+=	${ICONV_LIB}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-install:
diff --git a/graphics/libnsbmp/Makefile b/graphics/libnsbmp/Makefile
index f5ff3cf8a131..47f3717339a5 100644
--- a/graphics/libnsbmp/Makefile
+++ b/graphics/libnsbmp/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libnsbmp
 PORTVERSION=	0.1.5
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	NetSurf BMP decoder
@@ -17,8 +17,6 @@ BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 USES=		gmake
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/graphics/libnsgif/Makefile b/graphics/libnsgif/Makefile
index 13789d03eee3..dd307ffdc5ab 100644
--- a/graphics/libnsgif/Makefile
+++ b/graphics/libnsgif/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libnsgif
 PORTVERSION=	0.2.1
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	NetSurf GIF Decoder
@@ -17,7 +17,6 @@ BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=		gmake
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/textproc/libcss/Makefile b/textproc/libcss/Makefile
index aa1b47df2978..75046207b89a 100644
--- a/textproc/libcss/Makefile
+++ b/textproc/libcss/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libcss
 PORTVERSION=	0.8.0
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Cascading Style Sheets library
@@ -19,7 +19,6 @@ LIB_DEPENDS=	libwapcaplet.so:textproc/libwapcaplet \
 
 USES=		gmake iconv:wchar_t localbase pkgconfig
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 LDFLAGS+=	${ICONV_LIB}
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/textproc/libwapcaplet/Makefile b/textproc/libwapcaplet/Makefile
index b4ace08eb95b..558b75f14762 100644
--- a/textproc/libwapcaplet/Makefile
+++ b/textproc/libwapcaplet/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libwapcaplet
 PORTVERSION=	0.4.1
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	String internment library
@@ -13,13 +13,11 @@ COMMENT=	String internment library
 LICENSE=	MIT
 
 BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem \
-	${LOCALBASE}/bin/flex:textproc/flex
+		${LOCALBASE}/bin/flex:textproc/flex
 
-USES=	gmake
+USES=		gmake
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 MAKE_ENV=	COMPONENT_TYPE="lib-shared" \
 		FLEX="${LOCALBASE}/bin/flex"
 
diff --git a/www/libdom/Makefile b/www/libdom/Makefile
index d38fd5be5c5a..b508e47e759c 100644
--- a/www/libdom/Makefile
+++ b/www/libdom/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	libdom
 PORTVERSION=	0.3.3
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Document Object Model library
@@ -22,8 +22,6 @@ LIB_DEPENDS=	libwapcaplet.so:textproc/libwapcaplet \
 USES=		gmake iconv localbase pkgconfig
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 MAKE_ENV=	COMPONENT_TYPE="lib-shared"
 
 PLIST_SUB=	VERSION=${PORTVERSION}