diff --git a/www/py-isso/Makefile b/www/py-isso/Makefile
index e383b5a..e6a5a73 100644
--- a/www/py-isso/Makefile
+++ b/www/py-isso/Makefile
@@ -2,42 +2,43 @@
 
 PORTNAME=		isso
 DISTVERSION=	0.12.2
-CATEGORIES=		www
-MASTER_SITES=	https://posativ.org/isso/
+CATEGORIES=		www python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=		rt@scientifics.de
-COMMENT=		A commenting server silimar to Disqus
+COMMENT=		commenting server similar to Disqus
 
 LICENSE=		MIT
 LICENSE_FILE=	$(WRKSRC)/LICENSE
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		posativ
+GH_PROJECT=		${PORTNAME}
+GH_TAGNAME=		${DISTVERSION}
 
-COMMIT_ID=		7be6a756a34e3dafa1ffddf1eb385b0c44f6b6c6
-
-NO_ARCH=		yes
-USES=           python
+USES=           python sqlite:3
 USE_PYTHON=		autoplist concurrent distutils
+NO_ARCH=		yes
 
 USERS=          www
 GROUPS=         www
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}werkzeug>=0.9:www/py-werkzeug@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}misaka>0:textproc/py-misaka@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}misaka>=2.0:textproc/py-misaka@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
-				sqlite3>0:databases/sqlite3
+				${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>1.3.0:devel/py-cffi@${PY_FLAVOR}
 
 USE_RC_SUBR=	isso
 
-PLIST_FILES=  "etc/isso.conf.sample"
+PLIST_FILES=	"etc/isso.conf.sample"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/isso.conf|/usr/local/etc/isso.conf|g' ${WRKSRC}/isso/__init__.py
@@ -46,4 +47,14 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${CP} ${WRKSRC}/share/isso.conf ${STAGEDIR}${PREFIX}/etc/isso.conf.sample
 
-.include <bsd.port.mk>
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m nosetests -v
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>2.1:devel/py-ipaddr@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>