diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index b535ea9a1eb1..1d78b54970e0 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,20 +22,16 @@ LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index a097bb17acd3..d79391fb6205 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eog-1.0.1.tar.bz2) = 0870d7a21aa33bc6c959ec8a83d0e003
+MD5 (gnome2/eog-1.0.2.tar.bz2) = 7c3921d64273b45f6ea2c6ac314add22
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index 17554c6671ed..ad584a399300 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,5 +1,4 @@
 bin/eog
-bin/eog-image-viewer
 etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml
@@ -10,6 +9,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml
 etc/gconf/schemas/eog.schemas
 libdata/bonobo/servers/GNOME_EOG.server
+libexec/eog-image-viewer
 share/gnome/applications/eog.desktop
 share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml
 share/gnome/gnome-2.0/ui/eog-image-view-ui.xml
@@ -26,6 +26,7 @@ share/gnome/pixmaps/eog/right-down.png
 share/gnome/pixmaps/gnome-eog.png
 share/locale/ar/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
+share/locale/bg/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
 share/locale/da/LC_MESSAGES/eog.mo
@@ -53,6 +54,7 @@ share/locale/ro/LC_MESSAGES/eog.mo
 share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/sk/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
+share/locale/sq/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/ta/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
@@ -61,16 +63,5 @@ share/locale/vi/LC_MESSAGES/eog.mo
 share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
-@dirrm share/gnome/pixmaps/eog
 @dirrm share/gnome/omf/eog
 @dirrm share/gnome/help/eog/C/figures
-@dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/window
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/full_screen
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog