diff --git a/extra/mate-image-viewer/doinst.sh b/extra/eom/doinst.sh
similarity index 100%
rename from extra/mate-image-viewer/doinst.sh
rename to extra/eom/doinst.sh
diff --git a/extra/mate-image-viewer/mate-image-viewer.SlackBuild b/extra/eom/eom.SlackBuild
similarity index 86%
rename from extra/mate-image-viewer/mate-image-viewer.SlackBuild
rename to extra/eom/eom.SlackBuild
index a423298..b83f899 100644
--- a/extra/mate-image-viewer/mate-image-viewer.SlackBuild
+++ b/extra/eom/eom.SlackBuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for mate-image-viewer
+# Slackware build script for eom
 
 # Copyright 2013 Chess Griffin <chess.griffin@gmail.com> Raleigh, NC
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=mate-image-viewer
-VERSION=${VERSION:-1.6.1}
+PRGNAM=eom
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_msb}
 
@@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-wget -c http://pub.mate-desktop.org/releases/1.6/$PRGNAM-$VERSION.tar.xz
+wget -c http://pub.mate-desktop.org/releases/1.7/$PRGNAM-$VERSION.tar.xz
 
 NUMJOBS=${NUMJOBS:-" -j8 "}
 
@@ -68,11 +68,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -106,10 +106,6 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-# Remove old GNOME omf stuff
-rm -rf $PKG/usr/share/omf/eom
-rmdir $PKG/usr/share/omf
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog HACKING NEWS* README THANKS TODO \
diff --git a/extra/eom/slack-desc b/extra/eom/slack-desc
new file mode 100644
index 0000000..4bf07b1
--- /dev/null
+++ b/extra/eom/slack-desc
@@ -0,0 +1,12 @@
+   |-----handy-ruler------------------------------------------------------|
+eom: eom (image viewer for the MATE desktop)
+eom:
+eom: eom is an image viewing and cataloging program.
+eom: This is a fork of Eye of GNOME.
+eom:
+eom:
+eom:
+eom:
+eom:
+eom: Homepage: http://www.mate-desktop.org
+eom:
diff --git a/extra/mate-image-viewer/slack-desc b/extra/mate-image-viewer/slack-desc
deleted file mode 100644
index 9915c45..0000000
--- a/extra/mate-image-viewer/slack-desc
+++ /dev/null
@@ -1,12 +0,0 @@
-                 |-----handy-ruler------------------------------------------------------|
-mate-image-viewer: mate-image-viewer (image viewer for the MATE desktop)
-mate-image-viewer:
-mate-image-viewer: mate-image-viewer is an image viewing and cataloging program.
-mate-image-viewer: This is a fork of Eye of GNOME.
-mate-image-viewer:
-mate-image-viewer:
-mate-image-viewer:
-mate-image-viewer:
-mate-image-viewer:
-mate-image-viewer: Homepage: http://www.mate-desktop.org
-mate-image-viewer:
diff --git a/mate-build-extra.sh b/mate-build-extra.sh
index 894d584..b849076 100755
--- a/mate-build-extra.sh
+++ b/mate-build-extra.sh
@@ -50,7 +50,7 @@ for dir in \
   deps/gupnp \
   extra/caja-extensions \
   extra/mate-icon-theme-faenza \
-  extra/mate-image-viewer \
+  extra/eom \
   extra/mate-media \
   extra/mate-menu-editor \
   extra/mate-power-manager \