diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
index 2fba2864a192..79eb0cfe625b 100644
--- a/editors/texstudio/Makefile
+++ b/editors/texstudio/Makefile
@@ -2,26 +2,38 @@
 
 PORTNAME=	texstudio
 PORTVERSION=	2.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
 
 MAINTAINER=	abiliojr@gmail.com
-COMMENT=	Integrated writing environment for creating LaTeX documents
+COMMENT=	Integrated writing environment for LaTeX documents
 
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
 
 USES=		desktop-file-utils dos2unix execinfo ghostscript:run \
 		pkgconfig qmake
 DOS2UNIX_FILES=	${PORTNAME}.pro
-USE_QT4=	gui network script svg xml iconengines_run \
-		designer_build moc_build rcc_build uic_build
+
+_USE_QT4=	gui network script svg xml \
+		iconengines_run designer_build moc_build rcc_build uic_build
+_USE_QT5=	gui network script svg xml \
+		printsupport concurrent uitools buildtools_build
+
 USE_TEX=	latex dvipsk
-INSTALLS_ICONS=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT5
+
+TOOLKIT_DESC=	Qt toolkit
+QT4_USE=	${_USE_QT4:S/^/QT4=/}
+QT4_LIB_DEPENDS=libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+QT5_USE=	${_USE_QT5:S/^/QT5=/}
+QT5_LIB_DEPENDS=libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
 		-e 's,/usr/include,${LOCALBASE}/include,g' \
diff --git a/editors/texstudio/files/patch-debughelper.cpp b/editors/texstudio/files/patch-debughelper.cpp
new file mode 100644
index 000000000000..13455629c8bc
--- /dev/null
+++ b/editors/texstudio/files/patch-debughelper.cpp
@@ -0,0 +1,19 @@
+--- debughelper.cpp.orig	2015-03-24 07:20:40 UTC
++++ debughelper.cpp
+@@ -499,10 +499,16 @@ void print_backtrace(const QString& mess
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[31] //not always used
+ #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.gp_regs[34]
+ #elif defined(CPU_IS_ARM)
++/*
+ #define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_pc
+ #define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_sp
+ #define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_fp
+ #define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.arm_lr
++*/
++#define PC_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R15]
++#define STACK_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R13]
++#define FRAME_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R11]
++#define RETURNTO_FROM_UCONTEXT(context) (context)->uc_mcontext.__gregs[_REG_R14]
+ #elif defined(CPU_IS_IA64)
+ #define PC_FROM_UCONTEXT(context) (context)->_u._mc.sc_ip
+ #define STACK_FROM_UCONTEXT(context) (context)->_u._mc.sc_gr[12] //is that register 12?