diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index d311b3746c3c..eda90c7bd279 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -5,31 +5,25 @@ PORTNAME=	abby
 PORTVERSION=	0.4.8
 PORTREVISION=	3
 CATEGORIES=	multimedia net
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/abby/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Front-end for c/clive
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
-
-OPTIONS_DEFINE=	CCLIVE
-OPTIONS_DEFAULT=	CCLIVE
-CCLIVE_DESC=	Use cclive backend (instead of clive)
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		qmake tar:bzip2
 USE_QT4=	gui network xml moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/abby
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	CCLIVE
+OPTIONS_DEFAULT=	CCLIVE
+CCLIVE_DESC=	Use cclive backend (instead of clive)
 
-.if ${PORT_OPTIONS:MCCLIVE}
-RUN_DEPENDS+=	cclive>=0.5.6:multimedia/cclive
-.else
-RUN_DEPENDS+=	clive>=2.2.5:multimedia/clive
-.endif
+CCLIVE_RUN_DEPENDS=	cclive>=0.5.6:multimedia/cclive
+CCLIVE_RUN_DEPENDS_OFF=	clive>=2.2.5:multimedia/clive
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abby ${STAGEDIR}${PREFIX}/bin/abby
diff --git a/multimedia/abby/pkg-descr b/multimedia/abby/pkg-descr
index c2031af43e1a..7277fe916be1 100644
--- a/multimedia/abby/pkg-descr
+++ b/multimedia/abby/pkg-descr
@@ -2,4 +2,4 @@ abby is a front-end for cclive and clive utilities that can
 be used to download videos from Youtube and similar video
 websites.
 
-WWW: http://abby.googlecode.com/
+WWW: https://code.google.com/archive/p/abby/