diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.1-respect-includedir.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.1-respect-includedir.patch
deleted file mode 100644
index 17fbd800..00000000
--- a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.4.1-respect-includedir.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 4674332a4edfa415cda74acbbe6552eaa938d966 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Sat, 14 May 2016 13:07:04 +0200
-Subject: [PATCH] MAKE: respect --includedir configure flag
-
-bakefile is a completely broken build system, this is the
-'cleanest' solution I could come up with.
-
-Upstream: no, https://github.com/utelle/wxsqlite3/issues/3
----
- build/wxsqlite3.bkl                    | 8 ++++----
- wx                                     | 1 +
- wxcode/bakefiles/presets/defaults.bkl  | 2 +-
- wxcode/bakefiles/presets/templates.bkl | 4 ++--
- 4 files changed, 8 insertions(+), 7 deletions(-)
- create mode 120000 wx
-
-diff --git a/build/wxsqlite3.bkl b/build/wxsqlite3.bkl
-index 7d0f380..92d4b94 100644
---- a/build30/wxsqlite3.bkl
-+++ b/build30/wxsqlite3.bkl
-@@ -22,10 +22,10 @@
- 
-   <!-- COMP_HDR lists the component's headers with path relative to ../include -->
-   <set var="COMP_HDR">
--    include/wx/wxsqlite3def.h
--	include/wx/wxsqlite3.h
--	include/wx/wxsqlite3dyn.h
--	include/wx/wxsqlite3opt.h
-+    wx/wxsqlite3def.h
-+	wx/wxsqlite3.h
-+	wx/wxsqlite3dyn.h
-+	wx/wxsqlite3opt.h
-   </set>
-   
-   <set var="USE_DYNAMIC_SQLITE3_LOAD_DEFAULT">0</set>
-diff --git a/wx b/wx
-new file mode 120000
-index 0000000..b00f3db
---- /dev/null
-+++ b/wx
-@@ -0,0 +1 @@
-+include/wx
-\ No newline at end of file
-diff --git a/wxcode/bakefiles/presets/defaults.bkl b/wxcode/bakefiles/presets/defaults.bkl
-index f653bad..37ab793 100644
---- a/wxcode/bakefiles/presets/defaults.bkl
-+++ b/wxcode/bakefiles/presets/defaults.bkl
-@@ -23,7 +23,7 @@
-          you can set them once in these vars and wxcode-* templates will automatically
-          use them. -->
-     <set var="COMP_SRC" overwrite="0">$(fileList('src/*.c*'))</set>
--    <set var="COMP_HDR" overwrite="0">$(fileList('include/wx/*.h'))</set>
-+    <set var="COMP_HDR" overwrite="0">$(fileList('wx/*.h'))</set>
- 
- 
-     <!--    A simple variable used to understand if we are          -->
-diff --git a/wxcode/bakefiles/presets/templates.bkl b/wxcode/bakefiles/presets/templates.bkl
-index a18433f..d33cdf8 100644
---- a/wxcode/bakefiles/presets/templates.bkl
-+++ b/wxcode/bakefiles/presets/templates.bkl
-@@ -54,7 +54,7 @@
- 
-     <template id="wxcode-lib" template="wx-lib,wxlike,wxcode-basic">
-         <install-to>$(LIBDIR)</install-to>
--        <install-headers-to>$(PREFIX)</install-headers-to>
-+        <install-headers-to>$(INCLUDEDIR)</install-headers-to>
- 
-         <wxcode-dirname>$(SRCDIR)/lib</wxcode-dirname>
-         <wxlike-libname prefix="wxcode">$(COMP_NAME)</wxlike-libname>
-@@ -65,7 +65,7 @@
- 
-     <template id="wxcode-dll" template="wx,wxlike,wxcode-basic">
-         <install-to>$(LIBDIR)</install-to>
--        <install-headers-to>$(PREFIX)</install-headers-to>
-+        <install-headers-to>$(INCLUDEDIR)</install-headers-to>
- 
-         <wxlike-dirname>$(SRCDIR)/lib</wxlike-dirname>
-         <wxlike-dllname prefix="wxcode">$(COMP_NAME)</wxlike-dllname>
--- 
-2.8.1
-
diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch
new file mode 100644
index 00000000..98a78831
--- /dev/null
+++ b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Fix-wxsqlite3.pc.patch
@@ -0,0 +1,31 @@
+From d13a710fc0f362a98438db9a55b56136d58c94cc Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Sun, 5 Feb 2017 15:42:55 +0100
+Subject: [PATCH 1/2] Fix wxsqlite3.pc
+Upstream: pending https://github.com/utelle/wxsqlite3/pull/10
+
+For more information see https://autotools.io/pkgconfig/file-format.html
+---
+ wxsqlite3.pc.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/wxsqlite3.pc.in b/wxsqlite3.pc.in
+index 65ea404..39fe17a 100644
+--- a/wxsqlite3.pc.in
++++ b/wxsqlite3.pc.in
+@@ -1,9 +1,9 @@
+ # Package Information for pkg-config
+ 
+-prefix=/usr
++prefix=@prefix@
+ wxver=@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@
+-includedir=${prefix}/include/wx-${wxver}/
+-libdir=${prefix}/@LIBDIR@
++includedir=@includedir@
++libdir=@libdir@
+ 
+ Name: wxsqlite3-@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@
+ Description: SQLite3 C++ wrapper for use in programs based on wxWidgets
+-- 
+2.11.0
+
diff --git a/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch
new file mode 100644
index 00000000..beb1b621
--- /dev/null
+++ b/packages/dev-db/wxsqlite3/files/wxsqlite3-3.5.1-Install-wxsqlite3.pc.patch
@@ -0,0 +1,27 @@
+From 50fa069824950451a5a8c9a96f9de17ba897786e Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Sun, 5 Feb 2017 15:55:09 +0100
+Subject: [PATCH] Install wxsqlite3.pc
+Upstream: pending https://github.com/utelle/wxsqlite3/pull/10
+
+---
+ Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 521d963..50e0643 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,6 +19,9 @@ LDADD = lib@WXSQLITE3_LIBNAME@.la $(WX_LIBS)
+ # Define the directory where the library headers are installed.
+ includewxdir = $(includedir)/wx
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = wxsqlite3.pc
++
+ # The main library. Notice that it uses dynamic, i.e. determined when running
+ # configure, name because it depends on the version of wxWidgets used. This is
+ # rather unusual, but Automake doesn't seem to mind.
+-- 
+2.11.0
+
diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.4.1.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.4.1.exheres-0
deleted file mode 100644
index 8b635fcc..00000000
--- a/packages/dev-db/wxsqlite3/wxsqlite3-3.4.1.exheres-0
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-require github [ user=utelle tag=v${PV} ]
-
-SUMMARY="C++ wrapper around the public domain SQLite 3.x database"
-
-LICENCES="wxWinLL-3"
-SLOT="3.0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        dev-util/bakefile[~0.2.9]
-    build+run:
-        dev-db/sqlite:3[>=3.12.1]
-        x11-libs/wxGTK:${SLOT}[providers:gtk3?][providers:gtk2?]
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PNV}-respect-includedir.patch
-)
-
-src_prepare() {
-    default
-
-    ln -s build30 build
-    edo pushd build
-
-    # upstream is completely clueless as to what they are doing
-    edo sed -i \
-            -e 's#^m4_include.*$#m4_include(../wxcode/autoconf/wxcode.m4)#' \
-            configure.ac
-
-    edo bakefile_gen -f autoconf
-    edo eaclocal
-    edo eautoconf
-    edo mv configure ..
-    edo popd
-}
-
-src_configure() {
-    econf \
-        --enable-shared \
-        --enable-unicode \
-        --with-wx-config="/usr/$(exhost --target)/bin/wx-config-${SLOT}-$(option providers:gtk3 gtk3 gtk2)" \
-        --with-wxshared \
-        --with-sqlite3-prefix="/usr/$(exhost --target)" \
-        --hates=disable-silent-rules \
-        --hates=enable-fast-install
-}
-
-src_install() {
-    default
-
-    local gtkver
-    if option providers:gtk3 ; then
-        gtkver=3
-    else
-        gtkver=2
-    fi
-
-    # this is the upstream .pc file and it doesn't get
-    # generated properly
-    # since upstream is uncollaborative, we'll keep sedding it
-    edo sed \
-        -e "s:prefix=/usr:prefix=/usr/$(exhost --target):" \
-        -e "s:wxcode_gtk2_wxsqlite3:wxcode_gtk${gtkver}u_wxsqlite3:" \
-        -e "s:@WXVERSION@:${SLOT}:g" \
-        -e "s:@LIBDIR@:lib:g" \
-        -e "s:@VERSION@:${PV}:g" \
-        ${PN}.pc.in > ${PN}.pc
-
-    insinto /usr/$(exhost --target)/lib/pkgconfig
-    doins ${PN}.pc
-}
-
diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0
new file mode 100644
index 00000000..a511b6f7
--- /dev/null
+++ b/packages/dev-db/wxsqlite3/wxsqlite3-3.5.1.exheres-0
@@ -0,0 +1,32 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require github [ user=utelle tag=v${PV} ]
+
+SUMMARY="C++ wrapper around the public domain SQLite 3.x database"
+
+LICENCES="wxWinLL-3"
+SLOT="3.0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+    ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
+"
+
+DEPENDENCIES="
+    build+run:
+        dev-db/sqlite:3[>=3.12.1]
+        x11-libs/wxGTK:${SLOT}[providers:gtk3?][providers:gtk2?]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PNV}-Fix-wxsqlite3.pc.patch
+    "${FILES}"/${PNV}-Install-wxsqlite3.pc.patch
+)
+
+src_configure() {
+    econf \
+        --with-wx-config="/usr/$(exhost --target)/bin/wx-config-${SLOT}-$(option providers:gtk3 gtk3 gtk2)"
+}
+