diff --git a/devel/qross/Makefile b/devel/qross/Makefile
index 54d819fddab1..ac524fffe73a 100644
--- a/devel/qross/Makefile
+++ b/devel/qross/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	qross
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://cloud.github.com/downloads/0xd34df00d/Qross/
+MASTER_SITES=	GH GHC
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Qt-only fork of Kross, the KDE scripting framework
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes
 USE_QT4=	designer gui network xml qmake_build uic_build moc_build \
 		rcc_build script testlib
+USE_GITHUB=	yes
+GH_ACCOUNT=	0xd34df00d
+GH_PROJECT=	Qross
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKSRC=		${WRKDIR}/0xd34df00d-Qross-82e1fd2/src
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -37,7 +37,7 @@ post-extract:
 
 post-install:
 .for lib in libqrossui libqrosscore qrossqts
-	@${LN} -s ${lib}.so.0.1 ${PREFIX}/lib/${lib}.so.1
+	@${LN} -s ${lib}.so.0.1 ${STAGEDIR}${PREFIX}/lib/${lib}.so.1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/qross/distinfo b/devel/qross/distinfo
index 47fa57ed2216..39313da6d426 100644
--- a/devel/qross/distinfo
+++ b/devel/qross/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qross-0.2.2.tar.bz2) = 02792ba25bdef11b444ca1d0b9f53fdd9aac9539307deb689b585967391a7c7b
-SIZE (qross-0.2.2.tar.bz2) = 3099984
+SHA256 (qross-0.3.1.tar.bz2) = d58b837e2568e6d3b5d6c3b3fe4734c550932f9569798c292587151a12159c9a
+SIZE (qross-0.3.1.tar.bz2) = 3961235
diff --git a/devel/qross/pkg-plist b/devel/qross/pkg-plist
index b4393f532583..d51613984c3f 100644
--- a/devel/qross/pkg-plist
+++ b/devel/qross/pkg-plist
@@ -28,6 +28,8 @@ lib/qt4/plugins/script/libqrossqtsplugin.so
 lib/qt4/plugins/script/libqrossqtsplugin.so.0.1
 share/cmake/Modules/FindQrosscore.cmake
 share/leechcraft/cmake/FindQrosscore.cmake
+@dirrmtry share/cmake/Modules
+@dirrmtry share/cmake
 @dirrmtry share/leechcraft/cmake
 @dirrmtry share/leechcraft
 @dirrmtry lib/qt4/plugins/script