diff --git a/x11-libs/scintilla/licenses/Scintilla b/x11-libs/scintilla/licenses/Scintilla
new file mode 100644
index 000000000..3f94364b2
--- /dev/null
+++ b/x11-libs/scintilla/licenses/Scintilla
@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/x11-libs/scintilla/scintilla-3.6.0.recipe b/x11-libs/scintilla/scintilla-3.6.0.recipe
new file mode 100644
index 000000000..6fd71f6a4
--- /dev/null
+++ b/x11-libs/scintilla/scintilla-3.6.0.recipe
@@ -0,0 +1,80 @@
+SUMMARY="A free source code editing component"
+DESCRIPTION="Scintilla is a free source code editing component. It comes with \
+complete source code and a license that permits use in any free project or \
+commercial product.
+As well as features found in standard text editing components, \
+Scintilla includes features especially useful when editing and debugging \
+source code. These include support for syntax styling, error indicators, code \
+completion and call tips. The selection margin can contain markers like those \
+used in debuggers to indicate breakpoints and the current line. Styling \
+choices are more open than with many editors, allowing the use of \
+proportional fonts, bold and italics, multiple foreground and background \
+colours and multiple fonts."
+HOMEPAGE="http://scintilla.org"
+SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla360.tgz"
+SOURCE_URI_001="https://prdownloads.sf.net/scintilla/scintillahaiku354.tgz"
+CHECKSUM_SHA256="eea7b9118549ab6de0fd8e3108ec2f2597a50e16f2592f54540ecf6407272b1e"
+CHECKSUM_SHA256_001="d7cda5041d8bdc8918d2b5be438ec8b95ebf0f0e64b72609244fceb00e543a19"
+SOURCE_DIR="$portName"
+REVISION="1"
+LICENSE="Scintilla"
+COPYRIGHT="1998-2015 Neil Hodgson"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+    # x86_gcc2 is fine as primary target architecture as long as we're building
+    # for a different secondary architecture.
+    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	scintilla$secondaryArchSuffix = $portVersion
+	"
+PROVIDES_devel="
+	scintilla${secondaryArchSuffix}_devel = $portVersion
+	devel:libscintilla$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:ar
+	cmd:make
+	cmd:g++$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	mkdir -p haiku
+	cp -R ../../sources-001/haiku/ .
+	cd haiku
+	make $jobArgs
+}
+
+INSTALL()
+{
+	INCLUDE_DIR=$includeDir/scintilla
+	
+	mkdir -p $libDir
+	mkdir -p $INCLUDE_DIR
+
+	cp -a bin/scintilla.a $libDir/libscintilla.a
+	cp include/*Lexer.h $INCLUDE_DIR
+	cp include/Sci_Position.h $INCLUDE_DIR
+	cp include/Scintilla.h $INCLUDE_DIR
+	cp haiku/ScintillaView.h $INCLUDE_DIR
+
+	prepareInstalledDevelLibs libscintilla
+	packageEntries devel $developDir
+}