diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 3cf435077ba8..913b0710ae21 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -2,18 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	vobject
-PORTVERSION=	0.8.1c
-PORTREVISION=	2
+PORTVERSION=	0.9.5
 CATEGORIES=	deskutils python
-MASTER_SITES=	http://vobject.skyhouseconsulting.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	ICalendar library
 
-RUN_DEPENDS=	py*-dateutil>=1.1:devel/py-dateutil
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+
+NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	eventable
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} tests.py
+
 .include <bsd.port.mk>
diff --git a/deskutils/py-vobject/distinfo b/deskutils/py-vobject/distinfo
index 9763b8c5d2a7..aefcfd21b45a 100644
--- a/deskutils/py-vobject/distinfo
+++ b/deskutils/py-vobject/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vobject-0.8.1c.tar.gz) = 594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5
-SIZE (vobject-0.8.1c.tar.gz) = 59925
+TIMESTAMP = 1502588702
+SHA256 (eventable-vobject-0.9.5_GH0.tar.gz) = 344bd0e2b95c507a1b99fee44f4f2bf3e12991f14b6f181bf98eed42162db764
+SIZE (eventable-vobject-0.9.5_GH0.tar.gz) = 215577
diff --git a/deskutils/py-vobject/pkg-descr b/deskutils/py-vobject/pkg-descr
index 70c39272ca81..de93a649952f 100644
--- a/deskutils/py-vobject/pkg-descr
+++ b/deskutils/py-vobject/pkg-descr
@@ -2,4 +2,4 @@ Vobject parses iCalendar and vCard files into Python data structures,
 decoding the relevant encodings. Also serializes vobject data structures
 to iCalendar, vCard, or (expirementally) hCalendar unicode strings.
 
-WWW: http://vobject.skyhouseconsulting.com/
+WWW: http://eventable.github.io/vobject/