diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 39474e1..bc7e4c6 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -1,14 +1,16 @@
 # $FreeBSD$
 
-PORTNAME=	squidGuard
+REALNAME=	squidGuard
+PORTNAME=	${REALNAME:tl}
 PORTVERSION=	1.4
 PORTREVISION=	15
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/:a \
 		http://www.squidguard.org/Downloads/Contrib/:b
+DISTNAME=	${REALNAME}-${DISTVERSIONFULL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:a \
-		squidGuard-1.4-quoted_string_support.diff:b \
-		squidGuard-1.4-dnsbl.patch:b
+		${DISTNAME}-quoted_string_support.diff:b \
+		${DISTNAME}-dnsbl.patch:b
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	garga@FreeBSD.org
@@ -23,7 +25,7 @@ USE_BDB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-db-inc=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR} \
-		--with-sg-config=${ETCDIR}/${PORTNAME}.conf \
+		--with-sg-config=${ETCDIR}/${REALNAME}.conf \
 		--with-sg-dbhome=${DATADIR} \
 		--with-sg-logdir=${LOGDIR} \
 		--with-squiduser=${SQUID_UID} \
@@ -34,14 +36,13 @@ SQUID_UID?=	squid
 SQUID_GID?=	squid
 PLIST_SUB+=	SQUID_UID='${SQUID_UID}' SQUID_GID='${SQUID_GID}'
 
-DATADIR?=	/var/db/${PORTNAME}
+DATADIR?=	/var/db/${REALNAME}
 ETCDIR=		${PREFIX}/etc/squid
 _DATADIR=	${WRKDIR}/data
-LOGDIR?=	/var/log/${PORTNAME}
+LOGDIR?=	/var/log/${REALNAME}
 PLIST_SUB+=	LOGDIR="${LOGDIR}"
 
 SUB_FILES=	pkg-deinstall pkg-message
-SUB_LIST=	PORTNAME=${PORTNAME}
 
 OPTIONS_DEFINE=		DNS_BL DOCS EXAMPLES LDAP QUOTE_STRING STRIP_NTDOMAIN
 
@@ -51,8 +52,8 @@ QUOTE_STRING_DESC=	Add quoted string patch
 STRIP_NTDOMAIN_DESC=	Add options to strip NT domain and krb realm
 
 OPTIONS_SUB=		yes
-QUOTE_STRING_EXTRA_PATCHES=	${DISTDIR}/squidGuard-1.4-quoted_string_support.diff:-p2
-DNS_BL_EXTRA_PATCHES=	${DISTDIR}/squidGuard-1.4-dnsbl.patch:-p1
+QUOTE_STRING_EXTRA_PATCHES=	${DISTDIR}/${DISTNAME}-quoted_string_support.diff:-p2
+DNS_BL_EXTRA_PATCHES=	${DISTDIR}/${DISTNAME}-dnsbl.patch:-p1
 STRIP_NTDOMAIN_EXTRA_PATCHES=	${FILESDIR}/extra-patch-strip.diff:-p0
 LDAP_CONFIGURE_ON=	--with-ldap
 LDAP_CONFIGURE_OFF=	--without-ldap
@@ -107,12 +108,12 @@ pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${SED} -e "s|@sg_dbhome@|${EXAMPLESDIR}/blacklists|" -e "s|@sg_logdir@|${LOGDIR}|" \
 		${WRKSRC}/samples/sample.conf.in \
-		>${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ; \
+		>${STAGEDIR}${ETCDIR}/${REALNAME}.conf.sample ; \
 	${ECHO_MSG} "       -> Sample configuration file installed in: ${ETCDIR}" ; \
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} "===>   Installing ${PORTNAME} documentation"
+	@${ECHO_MSG} "===>   Installing ${REALNAME} documentation"
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for i in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/README
 	${INSTALL_DATA} ${WRKSRC}$i ${STAGEDIR}${DOCSDIR}
diff --git a/www/squidguard/files/pkg-message.in b/www/squidguard/files/pkg-message.in
index 271a48b..67d7002 100644
--- a/www/squidguard/files/pkg-message.in
+++ b/www/squidguard/files/pkg-message.in
@@ -1,7 +1,7 @@
 ===================================================================
- In order to activate %%PORTNAME%% you have to edit squid.conf
- To the contain "url_rewrite_program %%PREFIX%%/bin/%%PORTNAME%%"
- and create a configuration file for %%PORTNAME%%.
+ In order to activate squidGuard you have to edit squid.conf
+ To the contain "url_rewrite_program %%PREFIX%%/bin/squidGuard"
+ and create a configuration file for squidGuard.
 
  Sample blacklists have been installed in %%EXAMPLESDIR%%.