diff --git a/www/squid/Makefile b/www/squid/Makefile
index 37f4dd7493cf..3924cd890d48 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	squid
 DISTVERSION=	6.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
 		http://www1.il.squid-cache.org/Versions/v6/ \
@@ -27,6 +28,7 @@ CONFLICTS=	squid-devel
 CPE_VENDOR=	squid-cache
 SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_RC_SUBR=	squid
 
 USERS=		squid
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index ac9fe8393a0c..12265ea015bf 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -1,25 +1,25 @@
 sbin/squidclient
 sbin/squid
 sbin/purge
-man/man8/url_lfs_rewrite.8.gz
-man/man8/storeid_file_rewrite.8.gz
-man/man8/squid.8.gz
-man/man8/security_fake_certverify.8.gz
-man/man8/log_db_daemon.8.gz
-man/man8/helper-mux.8.gz
-man/man8/ext_unix_group_acl.8.gz
-man/man8/ext_file_userip_acl.8.gz
-man/man8/ext_delayer_acl.8.gz
-man/man8/digest_file_auth.8.gz
-man/man8/cachemgr.cgi.8.gz
-man/man8/basic_radius_auth.8.gz
-man/man8/basic_pop3_auth.8.gz
-man/man8/basic_pam_auth.8.gz
-man/man8/basic_ncsa_auth.8.gz
-man/man8/basic_getpwnam_auth.8.gz
-man/man8/basic_db_auth.8.gz
-man/man1/squidclient.1.gz
-man/man1/purge.1.gz
+share/man/man8/url_lfs_rewrite.8.gz
+share/man/man8/storeid_file_rewrite.8.gz
+share/man/man8/squid.8.gz
+share/man/man8/security_fake_certverify.8.gz
+share/man/man8/log_db_daemon.8.gz
+share/man/man8/helper-mux.8.gz
+share/man/man8/ext_unix_group_acl.8.gz
+share/man/man8/ext_file_userip_acl.8.gz
+share/man/man8/ext_delayer_acl.8.gz
+share/man/man8/digest_file_auth.8.gz
+share/man/man8/cachemgr.cgi.8.gz
+share/man/man8/basic_radius_auth.8.gz
+share/man/man8/basic_pop3_auth.8.gz
+share/man/man8/basic_pam_auth.8.gz
+share/man/man8/basic_ncsa_auth.8.gz
+share/man/man8/basic_getpwnam_auth.8.gz
+share/man/man8/basic_db_auth.8.gz
+share/man/man1/squidclient.1.gz
+share/man/man1/purge.1.gz
 libexec/squid/url_lfs_rewrite
 libexec/squid/url_fake_rewrite.sh
 libexec/squid/url_fake_rewrite
@@ -44,11 +44,11 @@ libexec/squid/basic_getpwnam_auth
 libexec/squid/basic_fake_auth
 libexec/squid/basic_db_auth
 %%UNLINKD%%libexec/squid/unlinkd
-%%TDB%%man/man8/ext_time_quota_acl.8.gz
-%%TDB%%man/man8/ext_session_acl.8.gz
+%%TDB%%share/man/man8/ext_time_quota_acl.8.gz
+%%TDB%%share/man/man8/ext_session_acl.8.gz
 %%TDB%%libexec/squid/ext_time_quota_acl
 %%TDB%%libexec/squid/ext_session_acl
-%%SSL%%man/man8/security_file_certgen.8.gz
+%%SSL%%share/man/man8/security_file_certgen.8.gz
 %%SSL%%libexec/squid/security_file_certgen
 %%ICMP%%@(,squid,4510) libexec/squid/pinger
 %%FS_DISKD%%libexec/squid/diskd
@@ -150,28 +150,28 @@ libexec/squid/basic_db_auth
 %%ETCDIR%%/errors/templates/ERR_ACCESS_DENIED
 %%ETCDIR%%/errors/TRANSLATORS
 %%ETCDIR%%/errors/COPYRIGHT
-%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
+%%AUTH_SQL%%share/man/man8/ext_sql_session_acl.8.gz
 %%AUTH_SQL%%libexec/squid/ext_sql_session_acl
-%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
+%%AUTH_SMB%%share/man/man8/ext_wbinfo_group_acl.8.gz
 %%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
 %%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
 %%AUTH_SMB%%libexec/squid/basic_smb_auth
-%%AUTH_SASL%%man/man8/basic_sasl_auth.8.gz
+%%AUTH_SASL%%share/man/man8/basic_sasl_auth.8.gz
 %%AUTH_SASL%%libexec/squid/basic_sasl_auth
 %%AUTH_NIS%%libexec/squid/basic_nis_auth
-%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
-%%AUTH_LDAP%%man/man8/ext_edirectory_userip_acl.8.gz
-%%AUTH_LDAP%%man/man8/basic_ldap_auth.8.gz
+%%AUTH_LDAP%%share/man/man8/ext_ldap_group_acl.8.gz
+%%AUTH_LDAP%%share/man/man8/ext_edirectory_userip_acl.8.gz
+%%AUTH_LDAP%%share/man/man8/basic_ldap_auth.8.gz
 %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
 %%AUTH_LDAP%%libexec/squid/ext_edirectory_userip_acl
 %%AUTH_LDAP%%libexec/squid/digest_ldap_auth
 %%AUTH_LDAP%%libexec/squid/digest_edirectory_auth
 %%AUTH_LDAP%%libexec/squid/basic_ldap_auth
-%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz
+%%AUTH_KERB%%share/man/man8/negotiate_kerberos_auth.8.gz
 %%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth
 %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test
 %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth
-%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%man/man8/ext_kerberos_sid_group_acl.8.gz
+%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%share/man/man8/ext_kerberos_sid_group_acl.8.gz
 %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_sid_group_acl
 %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
 %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool