diff --git a/app-text/libetonyek/libetonyek-0.1.7.recipe b/app-text/libetonyek/libetonyek-0.1.8.recipe
similarity index 50%
rename from app-text/libetonyek/libetonyek-0.1.7.recipe
rename to app-text/libetonyek/libetonyek-0.1.8.recipe
index b759f6480..769b81bbe 100644
--- a/app-text/libetonyek/libetonyek-0.1.7.recipe
+++ b/app-text/libetonyek/libetonyek-0.1.8.recipe
@@ -1,28 +1,39 @@
 SUMMARY="Apple Keynote import library"
 DESCRIPTION="libetonyek is a library that parses the file format of Apple \
 Keynote documents. It supports Keynote versions 2-5."
-HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 COPYRIGHT="Fridrich Strba, David Tardon"
 LICENSE="MPL v2.0"
-REVISION="2"
-SOURCE_URI="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.bz2"
-CHECKSUM_SHA256="c3f112eb90c8b2f91c4e0aa3962abff333a731f63b2b9b6ac410e61338d9abef"
+REVISION="1"
+SOURCE_URI="https://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.xz"
+CHECKSUM_SHA256="9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="1.0.8"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVers="${portVersion%.*}"
+
 PROVIDES="
 	libetonyek$secondaryArchSuffix = $portVersion
-	cmd:numbers2csv$secondaryArchSuffix
-	cmd:pages2html$secondaryArchSuffix
-	cmd:key2raw$secondaryArchSuffix
-	cmd:numbers2raw$secondaryArchSuffix
-	cmd:pages2raw$secondaryArchSuffix
-	cmd:key2xhtml$secondaryArchSuffix
-	cmd:key2text$secondaryArchSuffix
-	cmd:numbers2text$secondaryArchSuffix
-	cmd:pages2text$secondaryArchSuffix
-	lib:libetonyek_0.1$secondaryArchSuffix = 1.0.7 compat >= 1
+	cmd:key2raw$commandSuffix = $portVersion
+	cmd:key2text$commandSuffix = $portVersion
+	cmd:key2xhtml$commandSuffix = $portVersion
+	cmd:numbers2csv$commandSuffix = $portVersion
+	cmd:numbers2raw$commandSuffix = $portVersion
+	cmd:numbers2text$commandSuffix = $portVersion
+	cmd:pages2html$commandSuffix = $portVersion
+	cmd:pages2raw$commandSuffix = $portVersion
+	cmd:pages2text$commandSuffix = $portVersion
+	lib:libetonyek_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,7 +47,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libetonyek${secondaryArchSuffix}_devel = $portVersion
-	devel:libetonyek_0.1$secondaryArchSuffix = 1.0.7 compat >= 1
+	devel:libetonyek_0.1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libetonyek$secondaryArchSuffix == $portVersion base
@@ -68,21 +79,34 @@ BUILD_PREREQUIRES="
 	cmd:gperf
 	"
 
+defineDebugInfoPackage libetonyek$secondaryArchSuffix \
+	"$commandBinDir"/key2raw \
+	"$commandBinDir"/key2text \
+	"$commandBinDir"/key2xhtml \
+	"$commandBinDir"/numbers2csv \
+	"$commandBinDir"/numbers2raw \
+	"$commandBinDir"/numbers2text \
+	"$commandBinDir"/pages2html \
+	"$commandBinDir"/pages2raw \
+	"$commandBinDir"/pages2text \
+	"$libDir"/libetonyek-$portVers.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure --with-mdds=1.2
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
+		--with-mdds=1.2
 	make $jobArgs
 }
 
 INSTALL()
 {
-	make install-strip
+	make install
 
 	# remove libtool file
-	rm $libDir/libetonyek-0.1.la
+	rm -f "$libDir"/libetonyek-$portVers.la
 
-	prepareInstalledDevelLibs libetonyek-0.1
+	prepareInstalledDevelLib libetonyek-$portVers
 	fixPkgconfig
 
 	packageEntries devel $developDir
@@ -90,6 +114,5 @@ INSTALL()
 
 TEST()
 {
-	# TODO: 1 test fails
 	make check
 }