diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index e5e08101572c..7b55ca97fc35 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,82 +1,81 @@
 # New ports collection makefile for:	distcc
 # Date created:				25 June 2002
 # Whom:					Frerich Raabe <frerich.raabe@gmx.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.11.2
+PORTVERSION=	2.12
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GNOME)
 USE_GNOME=	libgnomeui
 CONFIGURE_ARGS+=	"--with-gnome"
 PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	WITH_GNOME=""
 .elif defined(WITH_GTK)
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	"--with-gtk"
 PKGNAMESUFFIX=	-gtk
 PLIST_SUB+=	WITH_GNOME=""
 .else
 PLIST_SUB+=	WITH_GNOME="@comment "
 .endif
 
-MAN1=	distcc.1 distccd.1
-DOC_FILES=	AUTHORS COPYING INSTALL NEWS README \
-		doc/protocol-1.txt doc/status-1.txt
+MAN1=		distcc.1 distccd.1
+DOC_FILES=	AUTHORS INSTALL NEWS README \
+		doc/protocol-1.txt doc/status-1.txt \
+		doc/protocol-2.txt doc/reporting-bugs.txt
 
 pre-everything::
 	@${ECHO_MSG} "Available knobs for ${PORTNAME}"
 	@${ECHO_MSG} "  - WITH_GNOME: Build GUI monitor based on GNOME"
 	@${ECHO_MSG} "  - WITH_GTK: Build GUI monitor based on GTK"
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/distcc ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin
 .if defined(WITH_GNOME) || defined(WITH_GTK)
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/distccd.sh.sample \
+	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/distccd.sh.sample \
 		${PREFIX}/etc/rc.d/distccd.sh.sample
 
 post-install: install-doc install-man
 	@${TOUCH} /var/run/distccd.pid
 	@${CHOWN} distcc:distcc /var/run/distccd.pid
 	@${CAT} ${PKGMESSAGE}
 
 install-doc:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for FILE in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
 install-man:
 .for file in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 9f0fea6c8423..4733609fbf98 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1 +1 @@
-MD5 (distcc-2.11.2.tar.bz2) = 034bc9c36bd5c3d9c26241600510927b
+MD5 (distcc-2.12.tar.bz2) = f258778811c8610453471ea89faeaac6
diff --git a/devel/distcc/pkg-plist b/devel/distcc/pkg-plist
index 39f4c7887c78..70e92e95bfce 100644
--- a/devel/distcc/pkg-plist
+++ b/devel/distcc/pkg-plist
@@ -1,14 +1,15 @@
 @comment $FreeBSD$
 bin/distcc
 bin/distccmon-text
 %%WITH_GNOME%%bin/distccmon-gnome
 sbin/distccd
 etc/rc.d/distccd.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/protocol-1.txt
+%%PORTDOCS%%%%DOCSDIR%%/protocol-2.txt
 %%PORTDOCS%%%%DOCSDIR%%/status-1.txt
+%%PORTDOCS%%%%DOCSDIR%%/reporting-bugs.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%