diff --git a/devel/libspice-server/Makefile b/devel/libspice-server/Makefile
index 667f4e4bccfb..4a00d0742467 100644
--- a/devel/libspice-server/Makefile
+++ b/devel/libspice-server/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	libspice-server
 DISTVERSION=	0.15.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.spice-space.org/download/releases/spice-server/
 DISTNAME=	spice-${PORTVERSION}
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Implements the server side of the SPICE protocol
 WWW=		https://spice-space.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libopus.so:audio/opus
-BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive \
-		spice-protocol>=0.12.10:devel/spice-protocol
+BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 
 OPTIONS_DEFINE=		GSTREAMER LZ4 SASL STATISTICS
 OPTIONS_DEFAULT=	GSTREAMER LZ4 SASL
 STATISTICS_DESC=	Statistic code
 
 GSTREAMER_USES=			gstreamer
 GSTREAMER_CONFIGURE_ON=		--enable-gstreamer=1.0
 GSTREAMER_CONFIGURE_OFF=	--enable-gstreamer=no
 GSTREAMER_LIB_DEPENDS=		liborc-0.4.so:devel/orc
 
 LZ4_CONFIGURE_ENABLE=	lz4
 LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
 
 SASL_CONFIGURE_WITH=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 STATISTICS_CONFIGURE_ENABLE=	statistics
 
-USES=		autoreconf:2.69 compiler:c++11-lang cpe gmake gnome jpeg \
+USES=		autoreconf compiler:c++11-lang cpe gmake gnome jpeg \
 		libtool localbase:ldflag pkgconfig python ssl tar:bzip2 xorg
 
 USE_GNOME=	glib20
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	spice_project
 CPE_PRODUCT=	spice
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-celt051 \
 		--enable-manual=no
 
 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}" \
 		PYTHON=${PYTHON_CMD}
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/devel/libspice-server/files/patch-configure.ac b/devel/libspice-server/files/patch-configure.ac
new file mode 100644
index 000000000000..4d1a2e049a7d
--- /dev/null
+++ b/devel/libspice-server/files/patch-configure.ac
@@ -0,0 +1,43 @@
+--- configure.ac.orig	2021-04-17 06:49:29 UTC
++++ configure.ac
+@@ -41,6 +41,7 @@ AC_PROG_CC_C99
+ if test x"$ac_cv_prog_cc_c99" = xno; then
+     AC_MSG_ERROR([C99 compiler is required.])
+ fi
++AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_CANONICAL_HOST
+ LT_INIT([disable-static])
+@@ -204,7 +205,8 @@ AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN
+ PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
+ AC_SUBST(SSL_CFLAGS)
+ AC_SUBST(SSL_LIBS)
+-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
++dnl OpenSSL in the base system is not managed by pkgconfig
++dnl AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
+ 
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $SSL_CFLAGS"
+@@ -217,15 +219,16 @@ CFLAGS="$save_CFLAGS"
+ 
+ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+     AC_MSG_CHECKING([for jpeglib.h])
+-    AC_TRY_CPP(
+-[#include <stdio.h>
++    AC_PREPROC_IFELSE(
++[AC_LANG_SOURCE([[
++#include <stdio.h>
+ #undef PACKAGE
+ #undef VERSION
+ #undef HAVE_STDLIB_H
+-#include <jpeglib.h>],
+-        JPEG_LIBS='-ljpeg'
+-        AC_MSG_RESULT($jpeg_ok),
+-	AC_MSG_ERROR([jpeglib.h not found])),
++#include <jpeglib.h>]])],
++        [JPEG_LIBS='-ljpeg'
++        AC_MSG_RESULT($jpeg_ok)],
++	[AC_MSG_ERROR([jpeglib.h not found])]),
+     AC_MSG_ERROR([libjpeg not found]))
+ AC_SUBST(JPEG_LIBS)
+