diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index f150ee524..847afc9c4 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
 DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
+DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1-r1.ebuild
index f5b3f79f8..7f341cebe 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild,v 1.2 2014/09/29 07:30:52 jlec Exp $
+# $Id$
 
 EAPI=5
 
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild
new file mode 100644
index 000000000..318eb4e95
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit eutils cmake-utils
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="http://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 qt5 test"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	|| ( dev-cpp/antlr-cpp:2= dev-java/antlr:0[cxx] )
+	dev-db/sqlite:3
+	dev-libs/qcustomplot[qt5=]
+	x11-libs/qscintilla
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+	# https://github.com/qingfengxia/qhexedit still bundled
+	# x11-libs/qscintilla[qt4?,qt5?] still bundled
+	find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_enable test TESTING)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon images/sqlitebrowser.svg
+}