diff --git a/net-im/pidgin-privacy-please/Makefile b/net-im/pidgin-privacy-please/Makefile
index 81c7d7ce5823..0a262339a0b4 100644
--- a/net-im/pidgin-privacy-please/Makefile
+++ b/net-im/pidgin-privacy-please/Makefile
@@ -1,32 +1,35 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pidgin-privacy-please
 PORTVERSION=	0.7.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	4
 CATEGORIES=	net-im
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Privacy plugin for the pidgin instant messenger
 
 LICENSE=	GPLv2
 
-BROKEN=		Unfetchable (google code has gone away)
-
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpurple.so:net-im/libpurple
 BUILD_DEPENDS=	pidgin:net-im/pidgin
 RUN_DEPENDS=	pidgin:net-im/pidgin
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig
+USES=		gmake gettext libtool pkgconfig autoreconf
 USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	cockroach
+GH_TAGNAME=	21e7046
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-privacy-please/distinfo b/net-im/pidgin-privacy-please/distinfo
index 297868496e21..7d7210dda431 100644
--- a/net-im/pidgin-privacy-please/distinfo
+++ b/net-im/pidgin-privacy-please/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pidgin-privacy-please-0.7.1.tar.gz) = 8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
-SIZE (pidgin-privacy-please-0.7.1.tar.gz) = 346421
+TIMESTAMP = 1475441250
+SHA256 (cockroach-pidgin-privacy-please-v0.7.1-21e7046_GH0.tar.gz) = 8fb4d446f2f30ef226e562c8b46d25b6f2432b0c98509c2eb785d5ca6b97e802
+SIZE (cockroach-pidgin-privacy-please-v0.7.1-21e7046_GH0.tar.gz) = 35978
diff --git a/net-im/pidgin-privacy-please/pkg-descr b/net-im/pidgin-privacy-please/pkg-descr
index 874d41673a69..8ee6e25a9600 100644
--- a/net-im/pidgin-privacy-please/pkg-descr
+++ b/net-im/pidgin-privacy-please/pkg-descr
@@ -1,12 +1,12 @@
 Privacy please is a pidgin plugin to stop spammers from annoying you.
 
 It currently offers the following features:
 
   * Block individual users (with an optional auto-reply)
   * Block messages from people who are not on your contact list
     (with an optional auto-reply)
   * Suppress repeated authorization requests
 
 This plugin was formerly known as gaim-blocky.
 
-WWW: http://code.google.com/p/pidgin-privacy-please/
+WWW: https://github.com/cockroach/pidgin-privacy-please