diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 423ab312521c..2d0a75990a28 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diffuse
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
@@ -15,16 +15,17 @@ COMMENT=	A graphical N-way diff and merge tool written in python
 
 NO_BUILD=	yes
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_BZIP2=	yes
 
 MAN1=		diffuse.1
 
 OPTIONS=	MENU	"Add desktop menu (needs desktop-file-utils)"	on \
-		OMF	"Install OMF manual (needs scrollkeeper)"	on
+		OMF	"Install OMF manual (needs scrollkeeper)"	on \
+		NLS	"Install some translations (work in progress)"	on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .ifndef (NOPORTDOCS)
 DOCS=		AUTHORS COPYING ChangeLog README
@@ -46,21 +47,29 @@ INSTALLS_OMF=	yes
 PLIST_SUB+=	OMF="@comment "
 .endif
 
+.ifndef (WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+USE_GETTEXT=	yes
+TRANSLATIONS=	de
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g' \
 		${WRKSRC}/src/etc/${PORTNAME}rc
+	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
+		${WRKSRC}/src/etc/${PORTNAME}rc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
 		${PREFIX}/bin/${PORTNAME}
-
 	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
 
 post-install:
 	${MKDIR} ${DATADIR}/syntax
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/${PORTNAME}/syntax/*.syntax \
 		${DATADIR}/syntax/
-
 	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
 		${MANPREFIX}/man/man1/
 
@@ -69,35 +78,37 @@ post-install:
 	for n in ${DOCS}; do \
 		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
 	done
+.endif
 
+.ifndef (WITHOUT_NLS)
+	for x in ${TRANSLATIONS}; do \
+		${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
+		${MKDIR} ${WRKSRC}/translations/$${x}; \
+		${PREFIX}/bin/msgfmt -c -v ${WRKSRC}/translations/$${x}.po \
+			-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
+		${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
+			${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
+	done
 .endif
 
 .ifdef (WITH_OMF)
-
 	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/C
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/C/*.xml \
 		${PREFIX}/share/gnome/help/${PORTNAME}/C/
-
 	${MKDIR} ${PREFIX}/share/omf/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
 		${PREFIX}/share/omf/${PORTNAME}/
-
 	${PREFIX}/bin/scrollkeeper-update -q
-
 .endif
 
 .ifdef (WITH_MENU)
-
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
 		${PREFIX}/share/pixmaps/
-
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
 		${DESKTOPDIR}
-
 	${PREFIX}/bin/update-desktop-database
-
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
index a4c7837b9056..ae295da8fb24 100644
--- a/devel/diffuse/distinfo
+++ b/devel/diffuse/distinfo
@@ -1,3 +1,3 @@
-MD5 (diffuse-0.3.3.tar.bz2) = 4c483b557d270024704120adc2552c2c
-SHA256 (diffuse-0.3.3.tar.bz2) = 326dbff9494af021c32a3ab45dea5abac7113e5c733853ca8879203e0f73d214
-SIZE (diffuse-0.3.3.tar.bz2) = 96642
+MD5 (diffuse-0.3.4.tar.bz2) = 706842d366676d4f754792f71489ec2a
+SHA256 (diffuse-0.3.4.tar.bz2) = 3982c0aabe5f02ad6a65cbde9fa86683db71ae72a8ce4505e18c0f781da9755f
+SIZE (diffuse-0.3.4.tar.bz2) = 102845
diff --git a/devel/diffuse/pkg-plist b/devel/diffuse/pkg-plist
index c499fe8fdb7e..f7ffb464f373 100644
--- a/devel/diffuse/pkg-plist
+++ b/devel/diffuse/pkg-plist
@@ -6,6 +6,7 @@ etc/diffuserc
 %%DATADIR%%/syntax/csharp.syntax
 %%DATADIR%%/syntax/css.syntax
 %%DATADIR%%/syntax/gettext.syntax
+%%DATADIR%%/syntax/glsl.syntax
 %%DATADIR%%/syntax/html.syntax
 %%DATADIR%%/syntax/ini.syntax
 %%DATADIR%%/syntax/java.syntax
@@ -45,3 +46,4 @@ etc/diffuserc
 %%MENU%%@dirrmtry share/applications
 %%MENU%%share/pixmaps/diffuse.png
 %%MENU%%@dirrmtry share/pixmaps
+%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo