diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index da33f50e2800..83c4b28f485c 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webp
-PORTVERSION=	0.0.1
+PORTVERSION=	0.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-leptonica-${PORTVERSION}
@@ -20,24 +20,23 @@ LIB_DEPENDS=	vpx.0:${PORTSDIR}/multimedia/libvpx \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/leptonlib-1.066
+CONFIGURE_WRKSRC=	${WRKSRC}/libwebp
+CONFIGURE_ARGS+=	LDFLAGS="-L${WRKSRC}/leptonlib-1.066/lib/nodebug"
+CFLAGS+=	-I${WRKSRC}/leptonlib-1.066/src
 WRKSRC=		${WRKDIR}/${PORTNAME}
+INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
 PLIST_FILES=	bin/webpconv
 
-pre-patch:
+pre-configure:
+.for f in missing depcomp install-sh
+		@cd ${WRKSRC}/libwebp && ${LN} -sf ../leptonlib-1.066/config/$f
+.endfor
 		@${REINPLACE_CMD} -e '/^CFLAGS =/s:$$: -I/usr/local/include:' \
-			${CONFIGURE_WRKSRC}/src/makefile
-		@${REINPLACE_CMD} -e '/^INCLUDES =/s:$$: -I/usr/local/include:'\
-			-e '/^LDFLAGS /s:$$: -L/usr/local/lib:' \
-			-e 's:-o webpconv:& $$(LDFLAGS):' \
-			${WRKSRC}/libwebp/makefile
+			${WRKSRC}/leptonlib-1.066/src/makefile
 
 do-build:
-		${GMAKE} -C ${CONFIGURE_WRKSRC}/src
-		${GMAKE} -C ${WRKSRC}/libwebp
-
-do-install:
-		@${INSTALL_PROGRAM} ${WRKSRC}/libwebp/webpconv ${PREFIX}/bin
+		${GMAKE} -C ${WRKSRC}/leptonlib-1.066/src
+		${MAKE} -C ${WRKSRC}/libwebp
 
 .include <bsd.port.mk>
diff --git a/graphics/webp/distinfo b/graphics/webp/distinfo
index fbfe4d68498a..584e11daf436 100644
--- a/graphics/webp/distinfo
+++ b/graphics/webp/distinfo
@@ -1,3 +1,3 @@
-MD5 (webp-leptonica-0.0.1.tar.gz) = 9dcf27e28cbded11e719a26547d87c55
-SHA256 (webp-leptonica-0.0.1.tar.gz) = 1d277234b30e9e400f4bbf349c17dab6025ee8df00633d7d8f9fa6ae9fc4a7fe
-SIZE (webp-leptonica-0.0.1.tar.gz) = 1246544
+MD5 (webp-leptonica-0.0.2.tar.gz) = fbcb552de1b68d6ed79dc145ad10edf7
+SHA256 (webp-leptonica-0.0.2.tar.gz) = 610a87424bbdf526510d9e412931e2564feabaec0fd0f1572000fb52c6f37b94
+SIZE (webp-leptonica-0.0.2.tar.gz) = 1519107