diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index 2e7d93fd683b..482cad0075aa 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -1,60 +1,50 @@
 PORTNAME=	vlock
 PORTVERSION=	2.2.3
 PORTREVISION=	5
 CATEGORIES=	security
-MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/ \
-		LOCAL/martymac
+MASTER_SITES=	LOCAL/martymac
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Locks a terminal
 WWW=		http://freshmeat.net/projects/vlock
 
 LICENSE=	GPLv2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-plugins --enable-pam \
 		--prefix=${PREFIX} \
 		--mandir=${PREFIX}/share/man \
-		--with-modules="${VLOCKMODULES}" \
+		--with-modules="all.so new.so" \
 		--with-scripts="${VLOCKSCRIPTS}" \
-		VLOCK_GROUP="nobody" \
-		EXTRA_CFLAGS="-I${LOCALBASE}/include" \
-		EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
+		VLOCK_GROUP="nobody"
 USES=	gmake
 USE_CSTD=	gnu99
 
-OPTIONS_DEFINE=	ROOTPWD VLOCKSCRIPTS CACASAVER DOCS
+OPTIONS_DEFINE=	ROOTPWD VLOCKSCRIPTS DOCS
 OPTIONS_DEFAULT=	ROOTPWD
 OPTIONS_SUB=	yes
 ROOTPWD_DESC=	Enable unlock using root password
 ROOTPWD_CONFIGURE_ENABLE=	root-password
 VLOCKSCRIPTS_DESC=	Install sample hook scripts
-CACASAVER_DESC=	Enable libcaca screensaver
-CACASAVER_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 
 # Default scripts/modules
 VLOCKSCRIPTS=
-VLOCKMODULES=	all.so new.so
 
 # Vlock special group
 VLOCK_GRP=	vlock
 GROUPS=	${VLOCK_GRP}
 PLIST_SUB+=	VLOCK_GRP=${VLOCK_GRP}
 
 PORTDOCS=	ChangeLog PLUGINS README README.X11 SECURITY TODO
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVLOCKSCRIPTS}
 VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
 .endif
 
-.if ${PORT_OPTIONS:MCACASAVER}
-VLOCKMODULES+=	caca.so
-.endif
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/vlock/pkg-plist b/security/vlock/pkg-plist
index 8164bf5ccdca..b925c3847d4f 100644
--- a/security/vlock/pkg-plist
+++ b/security/vlock/pkg-plist
@@ -1,15 +1,14 @@
 bin/vlock
 share/man/man1/vlock.1.gz
 share/man/man5/vlock-plugins.5.gz
 share/man/man8/vlock-main.8.gz
 %%VLOCKSCRIPTS%%lib/vlock/scripts/amarok
 %%VLOCKSCRIPTS%%lib/vlock/scripts/example_script
 %%VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
 lib/vlock/modules/all.so
-%%CACASAVER%%lib/vlock/modules/caca.so
 @mode 4711
 sbin/vlock-main
 @mode
 @group %%VLOCK_GRP%%
 lib/vlock/modules/new.so
 @group wheel