diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 3f9b3c3910b8..270a1d931fd9 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fileroller
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index dead90fff698..e8aa542fb52b 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -76,18 +76,31 @@ share/gnome/help/file-roller/zh_TW/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
@@ -195,3 +208,16 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 3f9b3c3910b8..270a1d931fd9 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fileroller
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index dead90fff698..e8aa542fb52b 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -76,18 +76,31 @@ share/gnome/help/file-roller/zh_TW/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
@@ -195,3 +208,16 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs/batch-add
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-zh_TW.omf 2>/dev/null || /usr/bin/true