diff --git a/dev-libs/librevenge/librevenge-0.0.4.recipe b/dev-libs/librevenge/librevenge-0.0.4.recipe
index 94a3b17a5..f6ef7cff1 100644
--- a/dev-libs/librevenge/librevenge-0.0.4.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.4.recipe
@@ -10,18 +10,22 @@ COPYRIGHT="2004-2015 Fridrich Strba
 	2011-2015 Laurent Alonso"
 LICENSE="GNU LGPL v2.1
 	MPL v2.0"
-REVISION="5"
-SOURCE_URI="http://downloads.sf.net/libwpd/librevenge-$portVersion.tar.bz2"
+REVISION="6"
+SOURCE_URI="https://downloads.sf.net/libwpd/librevenge-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"
+PATCHES="librevenge-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="0.0.4"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	librevenge$secondaryArchSuffix = $portVersion compat >= 0
-	lib:librevenge_0.0$secondaryArchSuffix = $portVersion compat >= 0
-	lib:librevenge_generators_0.0$secondaryArchSuffix = $portVersion compat >= 0
-	lib:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	librevenge$secondaryArchSuffix = $portVersion
+	lib:librevenge_0.0$secondaryArchSuffix = $libVersionCompat
+	lib:librevenge_generators_0.0$secondaryArchSuffix = $libVersionCompat
+	lib:librevenge_stream_0.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -29,10 +33,10 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	librevenge${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:librevenge_0.0$secondaryArchSuffix = $portVersion compat >= 0
-	devel:librevenge_generators_0.0$secondaryArchSuffix = $portVersion compat >= 0
-	devel:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	librevenge${secondaryArchSuffix}_devel = $portVersion
+	devel:librevenge_0.0$secondaryArchSuffix = $libVersionCompat
+	devel:librevenge_generators_0.0$secondaryArchSuffix = $libVersionCompat
+	devel:librevenge_stream_0.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	librevenge$secondaryArchSuffix == $portVersion base
@@ -58,13 +62,14 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage librevenge$secondaryArchSuffix \
+	"$libDir"/librevenge-0.0.so.$libVersion \
+	"$libDir"/librevenge-generators-0.0.so.$libVersion \
+	"$libDir"/librevenge-stream-0.0.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy
-	aclocal -I m4
-	autoheader
-	automake -a -c --foreign
-	autoconf
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -73,15 +78,14 @@ INSTALL()
 {
 	make install
 
-	rm $libDir/librevenge*.la
+	rm "$libDir"/librevenge*.la
 
-	# set up the develop directory correctly
 	prepareInstalledDevelLibs librevenge-0.0 librevenge-generators-0.0 \
 		librevenge-stream-0.0
 	fixPkgconfig
 
-	# devel package
-	packageEntries devel $developDir
+	packageEntries devel \
+		"$developDir"
 }
 
 TEST()
diff --git a/dev-libs/librevenge/patches/librevenge-0.0.4.patchset b/dev-libs/librevenge/patches/librevenge-0.0.4.patchset
new file mode 100644
index 000000000..ddc44318c
--- /dev/null
+++ b/dev-libs/librevenge/patches/librevenge-0.0.4.patchset
@@ -0,0 +1,21 @@
+From ffb95dc0820c46ce05ac1c6a33a72b6d4efcc9c2 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Thu, 13 Sep 2018 15:35:02 +0200
+Subject: gcc7 fails on missing [[fallthrough]];
+
+
+diff --git a/src/lib/RVNGZipStream.cpp b/src/lib/RVNGZipStream.cpp
+index b15eac5..f5081a5 100644
+--- a/src/lib/RVNGZipStream.cpp
++++ b/src/lib/RVNGZipStream.cpp
+@@ -478,6 +478,7 @@ RVNGInputStream *RVNGZipStream::getSubstream(RVNGInputStream *input, const char
+ 			// TODO: return partial result on Z_BUF_ERROR/Z_DATA_ERROR?
+ 			default:
+ 				data.clear();
++				[[fallthrough]];
+ 			// fall-through intended
+ 			case Z_STREAM_END:
+ 				done = true;
+-- 
+2.19.0
+