diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 0513414de964..4700c1c9471a 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -2,26 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	WinFF
-PORTVERSION=	1.5.2
-PORTREVISION=	7
+PORTVERSION=	1.5.5
 CATEGORIES=	multimedia
-MASTER_SITES=	GOOGLE_CODE
-PROJECTHOST=	${_PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
+MASTER_SITES=	http://winff.org/docs/source/
+DISTNAME=	${_PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Convert your videos quickly, easily, and all at once
 
 LICENSE=	GPLv3
 
-BROKEN=		Unfetchable (google code has gone away)
-
 BUILD_DEPENDS=	lazbuild:editors/lazarus
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 NO_WRKSUBDIR=	yes
-USE_FPC=	cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg x11
-USE_GNOME=	#
+USE_XORG=	x11
+USE_FPC=	cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11
+USE_GNOME=	cairo
 _PORTNAME=	${PORTNAME:tl}
 DATADIR=	${PREFIX}/share/${_PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${_PORTNAME}
@@ -39,6 +36,8 @@ LAZARUS_VER=	1.6.0
 LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 LCL_UNITS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
 
+BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/${_PORTNAME}
+
 OPTIONS_SINGLE=		LCL
 OPTIONS_SINGLE_LCL=	GTK2 QT4
 
@@ -63,23 +62,23 @@ BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/unit1.pas
-.for fp in unit1.pas unit4.pas
-	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${WRKSRC}/${fp}
+	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${BUILD_WRKSRC}/unit1.pas
+.for fp in unit1.pas unit4.pas scripts/check_presets.sh
+	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp}
 .endfor
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} -B winff.lpr
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/languages
-	${INSTALL_DATA} ${WRKSRC}/presets.xml ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/
-	${INSTALL_MAN} ${WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/winff-icons/48x48/${_PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/presets.xml ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/
+	${INSTALL_MAN} ${BUILD_WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${BUILD_WRKSRC}/winff-icons/48x48/${_PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${BUILD_WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/winff/distinfo b/multimedia/winff/distinfo
index 9c76ddf200be..0909933648b1 100644
--- a/multimedia/winff/distinfo
+++ b/multimedia/winff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (WinFF-1.5.2-source.tar.gz) = 9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c
-SIZE (WinFF-1.5.2-source.tar.gz) = 2320565
+TIMESTAMP = 1475613452
+SHA256 (winff-1.5.5-source.tar.gz) = 3f67400ab8f7f43d2290dff3c5a0a8b8a966ba67cd971edb5d63e6a127d7a485
+SIZE (winff-1.5.5-source.tar.gz) = 2622722
diff --git a/multimedia/winff/files/patch-unit1.pas b/multimedia/winff/files/patch-winff_unit1.pas
similarity index 94%
rename from multimedia/winff/files/patch-unit1.pas
rename to multimedia/winff/files/patch-winff_unit1.pas
index 36232a2bc1c1..e4a3c9ba5c6e 100644
--- a/multimedia/winff/files/patch-unit1.pas
+++ b/multimedia/winff/files/patch-winff_unit1.pas
@@ -1,5 +1,5 @@
---- unit1.pas.orig	2013-08-16 03:55:46 UTC
-+++ unit1.pas
+--- winff/unit1.pas.orig	2013-08-16 03:55:46 UTC
++++ winff/unit1.pas
 @@ -1228,13 +1228,13 @@ end;
  
  // launch browser
diff --git a/multimedia/winff/pkg-plist b/multimedia/winff/pkg-plist
index b7e0565b19c4..7ca0490e70b6 100644
--- a/multimedia/winff/pkg-plist
+++ b/multimedia/winff/pkg-plist
@@ -8,16 +8,17 @@ man/man1/winff.1.gz
 share/pixmaps/winff.png
 %%DATADIR%%/languages/winff.ab.po
 %%DATADIR%%/languages/winff.ar.po
+%%DATADIR%%/languages/winff.ast.po
 %%DATADIR%%/languages/winff.bg.po
 %%DATADIR%%/languages/winff.ca.po
 %%DATADIR%%/languages/winff.cs.po
-%%DATADIR%%/languages/winff.de.po
 %%DATADIR%%/languages/winff.de_DE.po
+%%DATADIR%%/languages/winff.de.po
 %%DATADIR%%/languages/winff.el.po
-%%DATADIR%%/languages/winff.en.po
-%%DATADIR%%/languages/winff.es.po
+%%DATADIR%%/languages/winff.en_GB.po
 %%DATADIR%%/languages/winff.es_AR.po
 %%DATADIR%%/languages/winff.es_UY.po
+%%DATADIR%%/languages/winff.es.po
 %%DATADIR%%/languages/winff.eu.po
 %%DATADIR%%/languages/winff.fr.po
 %%DATADIR%%/languages/winff.gl.po
@@ -37,14 +38,16 @@ share/pixmaps/winff.png
 %%DATADIR%%/languages/winff.pl.po
 %%DATADIR%%/languages/winff.po
 %%DATADIR%%/languages/winff.pot
-%%DATADIR%%/languages/winff.pt.po
 %%DATADIR%%/languages/winff.pt_BR.po
+%%DATADIR%%/languages/winff.pt.po
 %%DATADIR%%/languages/winff.ro.po
 %%DATADIR%%/languages/winff.ru.po
 %%DATADIR%%/languages/winff.se.po
+%%DATADIR%%/languages/winff.si_LK.po
 %%DATADIR%%/languages/winff.sk.po
 %%DATADIR%%/languages/winff.sl.po
 %%DATADIR%%/languages/winff.sr.po
+%%DATADIR%%/languages/winff.sr@latin.po
 %%DATADIR%%/languages/winff.sv.po
 %%DATADIR%%/languages/winff.te.po
 %%DATADIR%%/languages/winff.tr.po