diff -ruN py-xlib.orig/Makefile py-xlib/Makefile
--- py-xlib.orig/Makefile	2016-08-15 14:53:34.000000000 +0300
+++ py-xlib/Makefile	2016-09-07 13:37:52.088356000 +0300
@@ -2,16 +2,22 @@
 # $FreeBSD: head/x11-toolkits/py-xlib/Makefile 371203 2014-10-19 18:16:15Z mva $
 
 PORTNAME=	xlib
-PORTVERSION=	0.14
-PORTREVISION=	1
+PORTVERSION=	0.17
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-xlib-${PORTVERSION}
 
 MAINTAINER=	mwm@mired.org
 COMMENT=	X11 library for Python
 
+LICENSE=	GPLv2+
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	python-xlib
+GH_PROJECT=	python-xlib
+GH_TAGNAME=	eb3f4b7
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff -ruN py-xlib.orig/distinfo py-xlib/distinfo
--- py-xlib.orig/distinfo	2016-08-15 14:53:34.000000000 +0300
+++ py-xlib/distinfo	2016-09-06 15:14:25.349936000 +0300
@@ -1,2 +1,3 @@
-SHA256 (python-xlib-0.14.tar.gz) = 4771b0b6a605e0197ece5432fa601c61df724b32544239f463a867200f2160eb
-SIZE (python-xlib-0.14.tar.gz) = 200223
+TIMESTAMP = 1473164065
+SHA256 (python-xlib-python-xlib-0.17-eb3f4b7_GH0.tar.gz) = bb4d9ef635b6274bb0f3b9f1b74d35e05d2705dcd70ecacfdd67fee523d6f222
+SIZE (python-xlib-python-xlib-0.17-eb3f4b7_GH0.tar.gz) = 230379
diff -ruN py-xlib.orig/files/patch-Xlib_protocol_display.py py-xlib/files/patch-Xlib_protocol_display.py
--- py-xlib.orig/files/patch-Xlib_protocol_display.py	1970-01-01 03:00:00.000000000 +0300
+++ py-xlib/files/patch-Xlib_protocol_display.py	2016-09-06 15:19:12.190739000 +0300
@@ -0,0 +1,11 @@
+--- Xlib/protocol/display.py.orig	2016-08-10 13:52:51 UTC
++++ Xlib/protocol/display.py
+@@ -562,7 +562,7 @@ class Display(object):
+                 # We're the recieving thread, parse the data
+                 if recieving:
+                     try:
+-                        bytes_recv = self.socket.recv(2048)
++                        bytes_recv = self.socket.recv(4096)
+                     except socket.error as err:
+                         self.close_internal('server: %s' % err[1])
+                         raise self.socket_error
diff -ruN py-xlib.orig/files/patch-display py-xlib/files/patch-display
--- py-xlib.orig/files/patch-display	2016-08-15 14:53:34.000000000 +0300
+++ py-xlib/files/patch-display	1970-01-01 03:00:00.000000000 +0300
@@ -1,19 +0,0 @@
---- Xlib/protocol/display.py	2007-06-10 16:11:58.000000000 +0200
-+++ Xlib/protocol/display.py.port	2009-02-23 22:00:57.000000000 +0100
-@@ -1,6 +1,6 @@
- # $Id: display.py,v 1.25 2007/06/10 14:11:58 mggrant Exp $
- # -*- coding: latin-1 -*-
--#
-+# -*- coding: latin-1 -*-
- # Xlib.protocol.display -- core display communication
- #
- #    Copyright (C) 2000-2002 Peter Liljenberg <petli@ctrl-c.liu.se>
-@@ -534,7 +534,7 @@
-                 # We're the recieving thread, parse the data
-                 if recieving:
-                     try:
--                        bytes_recv = self.socket.recv(2048)
-+                        bytes_recv = self.socket.recv(4096)
-                     except socket.error, err:
-                         self.close_internal('server: %s' % err[1])
-                         raise self.socket_error