diff --git a/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
new file mode 100644
index 0000000000000..30eb43d3b83d2
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
+ GTK_INCLUDE = `$(GTK_CONFIG) gtk+-2.0 --cflags`
+ GTK_LIB = `$(GTK_CONFIG) gtk+-2.0 --libs`
+ 
+-GKRELLM_INCLUDE= -I/usr/local/include
++GKRELLM_INCLUDE= -I/usr/include
+ 
+ INSTALL=install -c -m 755
+ 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
index 47a89c183f0f6..e1853d3a37f85 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 MY_PN="gkrellmbgchg2"
@@ -12,19 +13,19 @@ DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
 HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
 SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO="gkrellmbgchg.so"
-PLUGIN_DOCS="bgchg_info.sh kdewallpaper.sh"
+PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
+
+PLUGIN_SO=( gkrellmbgchg$(get_modname) )
+PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
 
-src_prepare() {
-	default
-	sed -i "s:local/::" Makefile || die
+src_configure() {
 	tc-export CC
 }