diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index 88496bdb5c54a..f1e56dc528632 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit autotools-utils
+inherit out-of-source
 
 DESCRIPTION="Library for MS CHM (compressed html) file format"
 HOMEPAGE="http://www.jedrea.com/chmlib/"
@@ -14,13 +14,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
-DOCS=(AUTHORS NEWS README)
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.39-stdtypes.patch
 	"${FILESDIR}"/${P}-headers.patch
 )
 
-src_configure() {
-	myeconfargs=($(use_enable examples))
-	autotools-utils_src_configure
+my_src_configure() {
+	econf \
+		$(use_enable examples) \
+		$(use_enable static-libs static)
+}
+
+my_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
index 0f9232017689f..c0b809b2d9dba 100644
--- a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
+++ b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
@@ -1,5 +1,5 @@
---- src/chm_lib.c
-+++ src/chm_lib.c
+--- a/src/chm_lib.c
++++ b/src/chm_lib.c
 @@ -149,6 +149,17 @@ typedef unsigned __int32        UInt32;
  typedef __int64                 Int64;
  typedef unsigned __int64        UInt64;
diff --git a/dev-libs/chmlib/files/chmlib-0.40-headers.patch b/dev-libs/chmlib/files/chmlib-0.40-headers.patch
index d60af28639fd6..5daa458be8a52 100644
--- a/dev-libs/chmlib/files/chmlib-0.40-headers.patch
+++ b/dev-libs/chmlib/files/chmlib-0.40-headers.patch
@@ -1,5 +1,5 @@
---- src/chm_http.c
-+++ src/chm_http.c
+--- a/src/chm_http.c
++++ b/src/chm_http.c
 @@ -34,6 +34,7 @@
  #include <stdio.h>
  #include <stdlib.h>