diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
new file mode 100644
index 000000000..6d47c2586
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle-keep-qscintilla.patch
@@ -0,0 +1,62 @@
+--- sqlitebrowser-3.6.0/CMakeLists.txt
++++ sqlitebrowser-3.6.0/CMakeLists.txt
+@@ -21,14 +21,10 @@
+ 	set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
+ endif()
+ 
+-set(ANTLR_DIR libs/antlr-2.7.7)
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ 
+-add_subdirectory(${ANTLR_DIR})
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ add_subdirectory(${QSCINTILLA_DIR})
+ 
+ if(USE_QT5)
+@@ -207,9 +201,7 @@
+ 
+ include_directories(
+ 		"${CMAKE_CURRENT_BINARY_DIR}"
+-		${ANTLR_DIR}
+ 		${QHEXEDIT_DIR}
+-		${QCUSTOMPLOT_DIR}
+ 		${QSCINTILLA_DIR}
+ 		${ADDITIONAL_INCLUDE_PATHS}
+ 		src)
+@@ -227,12 +218,9 @@
+     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
+     set(QT_LIBRARIES "")
+ endif()
+-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
++add_dependencies(${PROJECT_NAME} qhexedit qscintilla2)
+ 
+ link_directories(
+-		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
+-		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
+-		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
+ 		"${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+ 
+ target_link_libraries(${PROJECT_NAME}
+--- sqlitebrowser-3.6.0/tests/CMakeLists.txt
++++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
+@@ -7,9 +7,6 @@
+     set(CMAKE_BUILD_TYPE "Release")
+ endif()
+ 
+-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
+-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
+-
+ if(USE_QT5)
+     find_package(Qt5Widgets REQUIRED)
+     set(CMAKE_AUTOMOC ON)
+@@ -65,7 +62,7 @@
+     QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
+ endif()
+ 
+-include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
++include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
+ 
+ add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
+ 
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
new file mode 100644
index 000000000..8dbe870f2
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
@@ -0,0 +1,18 @@
+--- sqlitebrowser-3.7.0/CMakeLists.txt
++++ sqlitebrowser-3.7.0/CMakeLists.txt
+@@ -29,15 +29,9 @@
+ find_package(Antlr2)
+ 
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ 
+-if(NOT ANTLR2_FOUND)
+-    set(ANTLR_DIR libs/antlr-2.7.7)
+-    add_subdirectory(${ANTLR_DIR})
+-endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ add_subdirectory(${QSCINTILLA_DIR})
+ 
+ if(USE_QT5)
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild
index 15caed8e3..318eb4e95 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="qt4 qt5 test"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-db b/profiles/pentoo/base/package.accept_keywords/dev-db
index 9f6220812..c132c9376 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-db
+++ b/profiles/pentoo/base/package.accept_keywords/dev-db
@@ -3,7 +3,9 @@ dev-db/mssqlscan
 dev-db/oat
 dev-db/sqlbf
 
-~dev-db/sqlitebrowser-3.7.0
+~dev-db/sqlitebrowser-3.3.1
+
+#~dev-db/sqlitebrowser-3.7.0
 dev-cpp/antlr-cpp:2
 
 ~dev-db/themole-0.3