diff --git a/xap/epdfview/epdfview-0.1.7-poppler.diff b/xap/epdfview/epdfview-0.1.7-poppler.diff
new file mode 100644
index 00000000..de3d1b23
--- /dev/null
+++ b/xap/epdfview/epdfview-0.1.7-poppler.diff
@@ -0,0 +1,13 @@
+diff -Naur epdfview-0.1.7.orig/src/PDFDocument.cxx epdfview-0.1.7/src/PDFDocument.cxx
+--- epdfview-0.1.7.orig/src/PDFDocument.cxx	2011-04-29 12:55:28.185708682 +0200
++++ epdfview-0.1.7/src/PDFDocument.cxx	2011-04-29 12:55:46.076504165 +0200
+@@ -686,8 +686,7 @@
+     repairEmpty(textRect);
+ 
+ #if defined (HAVE_POPPLER_0_6_0)
+-    gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
+-            &textRect);
++    gchar *text = poppler_page_get_text(page);
+ #else // !HAVE_POPPLER_0_6_0
+     gchar *text = poppler_page_get_text(page, &textRect);
+ #endif // HAVE_POPPLER_0_6_0
diff --git a/xap/epdfview/epdfview.SlackBuild b/xap/epdfview/epdfview.SlackBuild
index ce4c8d1c..d4235e0f 100755
--- a/xap/epdfview/epdfview.SlackBuild
+++ b/xap/epdfview/epdfview.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2009 Damien Goutte-Gattat
+# Copyright (C) 2009,2011 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -33,8 +33,8 @@ WGET=${WGET:-http://trac.emma-soft.com/epdfview/chrome/site/releases/$ARCHIVE}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-epdfview}
-BUILD=${BUILD:-1GGD}
-ARCH=${ARCH:-i486}
+BUILD=${BUILD:-2GGD}
+ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
 JOBS=${JOBS:-1}
 EXT=${EXT:-txz}
 
@@ -83,6 +83,7 @@ echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
 patch -p0 < $CWD/epdfview-$VERSION-mouse-scroll.diff
+patch -p1 < $CWD/epdfview-$VERSION-poppler.diff
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
 ./configure \
@@ -91,10 +92,6 @@ CXXFLAGS=$CPUOPT \
 make -j $JOBS
 make install-strip DESTDIR=$PKG
 
-# Strip binaries
-#find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
-#  xargs strip --strip-unneeded 2> /dev/null
-
 # Install desktop files
 mkdir -p $PKG/usr/share/{pixmaps,applications}
 install -m 644 $CWD/epdfview.desktop $PKG/usr/share/applications/