diff --git a/common/shlibs b/common/shlibs
index 3168b682768..69d12e6ed04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2771,3 +2771,4 @@ libopencsg.so.1 opencsg-1.4.2_1
 libCGAL.so.12 cgal-4.9_1
 libCGAL_Core.so.12 cgal-4.9_1
 libCGAL_ImageIO.so.12 cgal-4.9_1
+libqscintilla2-qt5.so.12 qscintilla-qt5-2.9.4_1
diff --git a/srcpkgs/qscintilla-qt5-devel b/srcpkgs/qscintilla-qt5-devel
new file mode 120000
index 00000000000..a8694458a44
--- /dev/null
+++ b/srcpkgs/qscintilla-qt5-devel
@@ -0,0 +1 @@
+qscintilla-qt5
\ No newline at end of file
diff --git a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
new file mode 100644
index 00000000000..bca4b87dc88
--- /dev/null
+++ b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
@@ -0,0 +1,42 @@
+02_configure.dpatch by Torsten Marek <shlomme@debian.org>
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott@kitterman.com>
+patch the configure script for the Python bindings to support object dir
+builds
+Index: Python/configure.py
+===================================================================
+--- Python/configure.py	2014-07-05 10:02:02.318834374 -0400
++++ Python/configure.py	2014-07-05 10:02:02.306834375 -0400
+@@ -31,6 +31,8 @@
+ import optparse
+ import sys
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ 
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
+@@ -210,6 +212,8 @@
+                     "The QScintilla version number could not be determined by "
+                     "reading %s." % sciglobal)
+ 
++        return # Debian: do not check for the installed version, we're good this way.
++
+         lib_dir = target_configuration.qsci_lib_dir
+         if lib_dir is None:
+             lib_dir = target_configuration.qt_lib_dir
+@@ -264,7 +268,12 @@
+         the target configuration.
+         """
+ 
+-        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++        if target_configuration.pyqt_package == 'PyQt5':
++            return os.path.join(src_dir, 'sip/qscimod5.sip')
++        else:
++            return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
+ 
+     def get_sip_installs(self, target_configuration):
+         """ Return a tuple of the installation directory of the module's .sip
+
diff --git a/srcpkgs/qscintilla-qt5/patches/qt5.patch b/srcpkgs/qscintilla-qt5/patches/qt5.patch
new file mode 100644
index 00000000000..8954c548423
--- /dev/null
+++ b/srcpkgs/qscintilla-qt5/patches/qt5.patch
@@ -0,0 +1,35 @@
+diff -up Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
+--- Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
++++ Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
+@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
+         win32: {
+             LIBS += -lqscintilla2d
+         } else {
++        greaterThan(QT_MAJOR_VERSION, 4) {
++            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++        } else {
+             LIBS += -lqscintilla2
+         }
++        }
+     }
+ } else {
++greaterThan(QT_MAJOR_VERSION, 4) {
++    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+     LIBS += -lqscintilla2
+ }
++}
+diff -up Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
+--- Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
++++ Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
+@@ -23,7 +23,11 @@
+ !win32:VERSION = 12.0.1
+ 
+ TEMPLATE = lib
++greaterThan(QT_MAJOR_VERSION, 4) {
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ TARGET = qscintilla2
++}
+ CONFIG += qt warn_off release thread exceptions hide_symbols
+ INCLUDEPATH += . ../include ../lexlib ../src
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
new file mode 100644
index 00000000000..22261790460
--- /dev/null
+++ b/srcpkgs/qscintilla-qt5/template
@@ -0,0 +1,25 @@
+# Template file for 'qscintilla-qt5'
+pkgname=qscintilla-qt5
+version=2.9.4
+revision=1
+wrksrc="QScintilla_gpl-${version}"
+build_wrksrc="Qt4Qt5"
+build_style="qmake"
+makedepends="qt5-devel"
+short_desc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
+maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
+homepage="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+license="GPL-3"
+distfiles="${SOURCEFORGE_SITE}/pyqt/${wrksrc}.tar.gz"
+checksum=8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6
+nocross=yes
+
+qscintilla-qt5-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/qt5/mkspecs
+	}
+}