diff --git a/editors/qscintilla/Makefile b/editors/qscintilla/Makefile
new file mode 100644
index 00000000000..54efe5d3c3e
--- /dev/null
+++ b/editors/qscintilla/Makefile
@@ -0,0 +1,43 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2008/10/27 00:01:45 bernd Exp $
+
+COMMENT =	Qt4 port of the Scintilla source code editor
+
+VERSION =	2.3
+DISTNAME =	QScintilla-gpl-${VERSION}
+PKGNAME =	qscintilla-${VERSION}
+CATEGORIES =	editors x11
+
+SHARED_LIBS =	qscintilla2 0.0
+
+HOMEPAGE =	http://www.riverbankcomputing.com/software/qscintilla/
+
+# GPLv2/GPLv3
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MASTER_SITES = http://www.riverbankcomputing.com/static/Downloads/QScintilla2/
+
+MODULES = devel/gettext x11/qt4
+
+WANTLIB =	ICE SM X11 Xext Xi Xinerama Xrandr Xrender fontconfig \
+		freetype glib-2.0 gthread-2.0 m png z
+
+LIB_DEPENDS =	QtCore,QtGui::x11/qt4
+
+CONFIGURE_ENV =	HOME=${WRKDIR}
+MAKE_FLAGS =	QMAKE_CXX=${CXX} QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		HOME=${WRKDIR} INSTALL_ROOT=${DESTDIR} \
+		LIBqscintilla2_VERSION=${LIBqscintilla2_VERSION}
+
+WRKSRC = ${WRKDIST}/Qt4
+
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/qscintilla.pro
+
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake4 \
+		${MAKE_FLAGS} qscintilla.pro
+
+.include <bsd.port.mk>
diff --git a/editors/qscintilla/distinfo b/editors/qscintilla/distinfo
new file mode 100644
index 00000000000..5e3485dc1f2
--- /dev/null
+++ b/editors/qscintilla/distinfo
@@ -0,0 +1,5 @@
+MD5 (QScintilla-gpl-2.3.tar.gz) = Rz13k1kv6WQGMQoqs06emw==
+RMD160 (QScintilla-gpl-2.3.tar.gz) = nsvE1O+e3cGQEVLU0NzAjn1wTAE=
+SHA1 (QScintilla-gpl-2.3.tar.gz) = kMjEt06StD/Y3jUP4S8gx/WJ5kU=
+SHA256 (QScintilla-gpl-2.3.tar.gz) = Q+BRyweza5zUVceBpCGo7SIaSNY0VbbQDqY745e+cMk=
+SIZE (QScintilla-gpl-2.3.tar.gz) = 2126817
diff --git a/editors/qscintilla/patches/patch-Qt4_qscintilla_pro b/editors/qscintilla/patches/patch-Qt4_qscintilla_pro
new file mode 100644
index 00000000000..9c02a4b2a57
--- /dev/null
+++ b/editors/qscintilla/patches/patch-Qt4_qscintilla_pro
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Qt4_qscintilla_pro,v 1.1.1.1 2008/10/27 00:01:45 bernd Exp $
+--- Qt4/qscintilla.pro.orig	Sat Sep 20 16:28:46 2008
++++ Qt4/qscintilla.pro	Sun Oct 26 12:39:44 2008
+@@ -43,7 +43,7 @@ INCLUDEPATH = . ../include ../src
+ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
+ 
+ # Handle both Qt v4 and v3.
+-target.path = $$[QT_INSTALL_LIBS]
++target.path = ${LOCALBASE}/lib
+ isEmpty(target.path) {
+ 	target.path = $(QTDIR)/lib
+ }
diff --git a/editors/qscintilla/pkg/DESCR b/editors/qscintilla/pkg/DESCR
new file mode 100644
index 00000000000..7ddd935fb55
--- /dev/null
+++ b/editors/qscintilla/pkg/DESCR
@@ -0,0 +1,6 @@
+As well as features found in standard text editing components,
+QScintilla includes features especially useful when editing and
+debugging source code.
+
+These include support for syntax styling, error indicators, code
+completion, call tips and much more.
diff --git a/editors/qscintilla/pkg/PFRAG.shared b/editors/qscintilla/pkg/PFRAG.shared
new file mode 100644
index 00000000000..0accac82bc1
--- /dev/null
+++ b/editors/qscintilla/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/10/27 00:01:45 bernd Exp $
+@lib lib/libqscintilla2.so.${LIBqscintilla2_VERSION}
diff --git a/editors/qscintilla/pkg/PLIST b/editors/qscintilla/pkg/PLIST
new file mode 100644
index 00000000000..c09f3340e36
--- /dev/null
+++ b/editors/qscintilla/pkg/PLIST
@@ -0,0 +1,57 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/27 00:01:45 bernd Exp $
+%%SHARED%%
+include/X11/qt4/
+include/X11/qt4/Qsci/
+include/X11/qt4/Qsci/qsciabstractapis.h
+include/X11/qt4/Qsci/qsciapis.h
+include/X11/qt4/Qsci/qscicommand.h
+include/X11/qt4/Qsci/qscicommandset.h
+include/X11/qt4/Qsci/qscidocument.h
+include/X11/qt4/Qsci/qsciglobal.h
+include/X11/qt4/Qsci/qscilexer.h
+include/X11/qt4/Qsci/qscilexerbash.h
+include/X11/qt4/Qsci/qscilexerbatch.h
+include/X11/qt4/Qsci/qscilexercmake.h
+include/X11/qt4/Qsci/qscilexercpp.h
+include/X11/qt4/Qsci/qscilexercsharp.h
+include/X11/qt4/Qsci/qscilexercss.h
+include/X11/qt4/Qsci/qscilexerd.h
+include/X11/qt4/Qsci/qscilexerdiff.h
+include/X11/qt4/Qsci/qscilexerfortran.h
+include/X11/qt4/Qsci/qscilexerfortran77.h
+include/X11/qt4/Qsci/qscilexerhtml.h
+include/X11/qt4/Qsci/qscilexeridl.h
+include/X11/qt4/Qsci/qscilexerjava.h
+include/X11/qt4/Qsci/qscilexerjavascript.h
+include/X11/qt4/Qsci/qscilexerlua.h
+include/X11/qt4/Qsci/qscilexermakefile.h
+include/X11/qt4/Qsci/qscilexerpascal.h
+include/X11/qt4/Qsci/qscilexerperl.h
+include/X11/qt4/Qsci/qscilexerpostscript.h
+include/X11/qt4/Qsci/qscilexerpov.h
+include/X11/qt4/Qsci/qscilexerproperties.h
+include/X11/qt4/Qsci/qscilexerpython.h
+include/X11/qt4/Qsci/qscilexerruby.h
+include/X11/qt4/Qsci/qscilexersql.h
+include/X11/qt4/Qsci/qscilexertcl.h
+include/X11/qt4/Qsci/qscilexertex.h
+include/X11/qt4/Qsci/qscilexervhdl.h
+include/X11/qt4/Qsci/qscilexerxml.h
+include/X11/qt4/Qsci/qscilexeryaml.h
+include/X11/qt4/Qsci/qscimacro.h
+include/X11/qt4/Qsci/qsciprinter.h
+include/X11/qt4/Qsci/qsciscintilla.h
+include/X11/qt4/Qsci/qsciscintillabase.h
+lib/qt4/
+lib/qt4/qsci/
+lib/qt4/qsci/api/
+lib/qt4/qsci/api/python/
+lib/qt4/qsci/api/python/Python-2.4.api
+lib/qt4/qsci/api/python/Python-2.5.api
+lib/qt4/qsci/api/python/Python-2.6.api
+lib/qt4/translations/
+lib/qt4/translations/qscintilla_cs.qm
+lib/qt4/translations/qscintilla_de.qm
+lib/qt4/translations/qscintilla_fr.qm
+lib/qt4/translations/qscintilla_pt_br.qm
+lib/qt4/translations/qscintilla_ru.qm