diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 6398a0f3b513..3eee981dbc2b 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -6,40 +6,59 @@
 #
 
 PORTNAME=	electricsheep
-PORTVERSION=	2.1
+PORTVERSION=	2.4
 CATEGORIES=	x11
-MASTER_SITES=	http://www-2.cs.cmu.edu/~spot/cache/
+MASTER_SITES=	http://electricsheep.org/
 
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	A nice distributed screensaver
 
+LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
 		xsetbg:${PORTSDIR}/graphics/xli \
 		curl:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_SDL=	yes
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+LIBTOOLFILES=	configure mpeg2dec/configure flame/configure
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share/electricsheep|g; \
-		s|setpgrp()|setpgrp(getpid(), getpid())|g' \
+	@${REINPLACE_CMD} -e \
+		's|sdl-config|sdl11-config|' \
+		${WRKSRC}/mpeg2dec/configure
+
+	@${REINPLACE_CMD} -e \
+		's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \
+		${WRKSRC}/Makefile.in
+
+	@${REINPLACE_CMD} -e \
+		's|<SDL/SDL.h>|<SDL11/SDL.h>|' \
+		${WRKSRC}/mpeg2dec/libvo/video_out_sdl.c
+
+	@${REINPLACE_CMD} -e \
+		's|/usr/local/share|${PREFIX}/share/electricsheep|' \
 		${WRKSRC}/electricsheep.c
-	@${REINPLACE_CMD} -e 's|/usr/include/X11|${X11BASE}/include|g; \
-		s|-I/usr/include||g; \
-		s|gcc|${CC}|g; \
-		s|^CC|#CC|g; \
-		s|/usr/lib/libjpeg.so.62||g' \
-		${WRKSRC}/video_out/Makefile
-	@${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|g' \
-		${WRKSRC}/flame/Makefile
+
+	@${REINPLACE_CMD} -e \
+		's|-Wall||; \
+		s|CFLAGS=\$$OPT_CFLAGS|#CFLAGS=\$$OPT_CFLAGS|' \
+		${WRKSRC}/mpeg2dec/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/flame/anim-flame ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/flame/pick-flame ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/video_out/mpeg_play ${PREFIX}/bin/mpeg-loop
-	${INSTALL} -d -m 0755 ${PREFIX}/share/electricsheep
-	${INSTALL_DATA} ${WRKSRC}/*.tif ${PREFIX}/share/electricsheep
+	@${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/flame/anim-flame ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/flame/convert-flame ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/flame/hqi-flame ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/flame/pick-flame ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mpeg2dec/src/mpeg2dec_onroot ${PREFIX}/bin
+	@${INSTALL} -d -m 0755 ${PREFIX}/share/electricsheep
+	@${INSTALL_DATA} ${WRKSRC}/*.tif ${PREFIX}/share/electricsheep
 
 .include <bsd.port.mk>
diff --git a/x11/electricsheep/distinfo b/x11/electricsheep/distinfo
index 8c3d77835ac2..c3f2983cac94 100644
--- a/x11/electricsheep/distinfo
+++ b/x11/electricsheep/distinfo
@@ -1 +1 @@
-MD5 (electricsheep-2.1.tar.gz) = c63c7584df6a885638d05e326daab7df
+MD5 (electricsheep-2.4.tar.gz) = 36886181194de0b9776665fb9e8820f4
diff --git a/x11/electricsheep/pkg-plist b/x11/electricsheep/pkg-plist
index f9e986a17056..f55e25614a76 100644
--- a/x11/electricsheep/pkg-plist
+++ b/x11/electricsheep/pkg-plist
@@ -1,7 +1,9 @@
 bin/electricsheep
+bin/convert-flame
+bin/mpeg2dec_onroot
+bin/hqi-flame
 bin/anim-flame
 bin/pick-flame
-bin/mpeg-loop
 share/electricsheep/electricsheep-frown.tif
 share/electricsheep/electricsheep-smile.tif
 share/electricsheep/electricsheep-splash-0.tif