diff --git a/deskutils/py-spice-gtk/Makefile b/deskutils/py-spice-gtk/Makefile
index 83a968f0cf13..c9dba88795dd 100644
--- a/deskutils/py-spice-gtk/Makefile
+++ b/deskutils/py-spice-gtk/Makefile
@@ -1,10 +1,11 @@
 # Created by: olevole@olevole.ru
 # $FreeBSD$
 
+PORTREVISION=	1
 COMMENT=	Python bindings for SPICE remote desktop servers
 MASTERDIR=	${.CURDIR}/../spice-gtk
 
 CONFLICTS=	spice-gtk-[0-9]*
 SPICE_SLAVE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile
index 0d66f9418759..9232d95225ba 100644
--- a/deskutils/spice-gtk/Makefile
+++ b/deskutils/spice-gtk/Makefile
@@ -1,64 +1,68 @@
 # Created by: olevole@olevole.ru
 # $FreeBSD$
 
 PORTNAME=	spice-gtk
 PORTVERSION=	0.32
+PORTREVISION?=	0
 CATEGORIES?=	deskutils gnome
 MASTER_SITES=	http://www.spice-space.org/download/gtk/
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT?=	Gtk client and libraries for SPICE remote desktop servers
 
 LICENSE=	GPLv2
 
 USE_XORG=	pixman
 USE_GNOME=	gnomeprefix gtk20 gtk30 intltool introspection:build
-USES=		cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix python ssl localbase
+USES=		autoreconf cpe gmake jpeg libtool pkgconfig tar:bzip2 \
+		python ssl localbase:ldflags
 CPE_VENDOR=	redhat
 
 BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing
 RUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 
 .if defined(SPICE_SLAVE)
 PORTREVISION=	1
 CATEGORIES+=	python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
 CONFIGURE_ARGS+=	--with-python
-PLIST_FILES+=	%%PYTHON_SITELIBDIR%%/SpiceClientGtk.so
 .endif
 
 SPICE_SSL_CFLAGS=	-I${OPENSSLINC}
 SPICE_SSL_LIBS=	-L${OPENSSLLIB} -lcrypto -lssl
 CONFIGURE_ENV+=	SSL_CFLAGS="${SPICE_SSL_CFLAGS}" SSL_LIBS="${SPICE_SSL_LIBS}" \
 		OPENSSL_CFLAGS="${SPICE_SSL_CFLAGS}" OPENSSL_LIBS="${SPICE_SSL_LIBS}"
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+# we can't use pathfix with USES=autoreconf
+MAKE_ARGS=	pkgconfigdir="$(PREFIX)/libdata/pkgconfig"
+
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	NLS DOCS SASL
 OPTIONS_DEFAULT=	GSTREAMER SASL
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	GSTREAMER PULSEAUDIO NOAUDIO
 
 NOAUDIO_DESC=		Disable audio backend
 
 GSTREAMER_CONFIGURE_ON=	--with-audio=gstreamer
 GSTREAMER_USE=	GSTREAMER1=yes
 PULSEAUDIO_CONFIGURE_ON=	--with-audio=pulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 NOAUDIO_CONFIGURE_ON=		--with-audio=no
 SASL_CONFIGURE_WITH=		sasl=yes
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 .include <bsd.port.mk>
diff --git a/deskutils/spice-gtk/files/patch-configure b/deskutils/spice-gtk/files/patch-configure
deleted file mode 100644
index 842a64391e8f..000000000000
--- a/deskutils/spice-gtk/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-02-03 17:27:02.495339000 +0100
-+++ configure	2016-02-03 17:27:23.048743000 +0100
-@@ -16074,7 +16074,7 @@
- fi
- 
- 
--SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
-+#SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
- 
- 
- # Check whether --with-sasl was given.
diff --git a/deskutils/spice-gtk/files/patch-configure.ac b/deskutils/spice-gtk/files/patch-configure.ac
new file mode 100644
index 000000000000..ff13861ccfd0
--- /dev/null
+++ b/deskutils/spice-gtk/files/patch-configure.ac
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2016-06-16 11:34:31 UTC
++++ configure.ac
+@@ -108,7 +108,7 @@ SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIR
+ PKG_CHECK_MODULES(SSL, openssl)
+ AC_SUBST(SSL_CFLAGS)
+ AC_SUBST(SSL_LIBS)
+-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
++#SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
+ 
+ SPICE_CHECK_SASL
+ 
+@@ -163,6 +163,10 @@ AS_IF([test "x$have_win32" = "xyes"], [A
+ AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
+ 
+ AC_CHECK_HEADERS([X11/XKBlib.h])
++AS_IF([test "x$have_quartz" != "xyes" && test "x$have_win32" != "xyes"],
++      [PKG_CHECK_MODULES(X11,x11)])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
+ 
+ AC_ARG_WITH([pnp-ids-path],
+   AC_HELP_STRING([--with-pnp-ids-path],
diff --git a/deskutils/spice-gtk/files/patch-src_Makefile.am b/deskutils/spice-gtk/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..63850b169113
--- /dev/null
+++ b/deskutils/spice-gtk/files/patch-src_Makefile.am
@@ -0,0 +1,18 @@
+--- src/Makefile.am.orig	2016-06-20 16:42:39 UTC
++++ src/Makefile.am
+@@ -100,6 +100,7 @@ SPICE_COMMON_CPPFLAGS =						\
+ 	$(GUDEV_CFLAGS)						\
+ 	$(SOUP_CFLAGS)						\
+ 	$(PHODAV_CFLAGS)					\
++	$(X11_CFLAGS)					\
+ 	$(LZ4_CFLAGS)					\
+ 	$(NULL)
+ 
+@@ -119,6 +120,7 @@ SPICE_GTK_LIBADD_COMMON =		\
+ 	libspice-client-glib-2.0.la	\
+ 	$(GTK_LIBS)			\
+ 	$(CAIRO_LIBS)			\
++	$(X11_LIBS)			\
+ 	$(LIBM)				\
+ 	$(NULL)
+