diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index ec612ebc6489..13c9df527aa2 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	21
+PORTREVISION=	22
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/cserv/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free program to do streaming video via the web
 WWW=		https://cserv.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		autoreconf jpeg libtool
+USES=		autoreconf jpeg libtool pkgconfig
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		BKTR IMLIB2 PIXBUF V4L DOCS
 OPTIONS_DEFAULT=	BKTR IMLIB2
 .if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
 OPTIONS_EXCLUDE=	BKTR
 .endif
 OPTIONS_SUB=		yes
 
 BKTR_DESC=	bktr(4) support
 
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_OFF=	ac_cv_path_IMLIB2_CONFIG=no
 
 PIXBUF_USES=	gnome
 PIXBUF_USE=	GNOME=gdkpixbuf
 PIXBUF_CONFIGURE_OFF=	ac_cv_path_GDKPIXBUF_CONFIG=no
 
 V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no
 
 post-patch:
 .for i in common/Makefile.am relay/Makefile.am
 	@${REINPLACE_CMD} -e \
 		'/^CFLAGS/s|-g||' ${WRKSRC}/${i}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README javascript.txt \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/multimedia/camserv/files/patch-configure.in b/multimedia/camserv/files/patch-configure.in
index 476c7b0583ee..ab3c1282ee48 100644
--- a/multimedia/camserv/files/patch-configure.in
+++ b/multimedia/camserv/files/patch-configure.in
@@ -1,39 +1,55 @@
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
 --- configure.in.orig	2002-05-12 18:06:12 UTC
 +++ configure.in
-@@ -9,15 +9,13 @@ AM_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA
+@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE
  AM_CONFIG_HEADER(include/camserv_config.h:config.in)
  AM_MAINTAINER_MODE
  
 -AM_ACLOCAL_INCLUDE(macros)
 -
  AC_PROG_CC
 -AC_LIBLTDL_CONVENIENCE
 +AC_LIBLTDL_INSTALLABLE
  AC_LIBTOOL_DLOPEN
 -AM_PROG_LIBTOOL
 +AC_PROG_LIBTOOL
  AC_SUBST(LIBLTDL)
 +AC_SUBST(INCLTDL)
  
 -AC_CONFIG_SUBDIRS(libltdl)
  
  AC_CHECK_LIB(m,sqrt)
  AC_CHECK_LIB(jpeg,jpeg_start_compress)
-@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf
+@@ -35,6 +33,12 @@ if test "$IMLIB2_CONFIG"x != "x"; then
+ 		 CFLAGS="$CFLAGS $IMLIB2_CFLAGS"
+ 		 ;;
+ 	esac
++	else
++		if pkg-config imlib2; then
++			IMLIB2_CFLAGS=`pkg-config --cflags imlib2`
++		 	IMLIB2_LIBS=`pkg-config --libs imlib2`
++			AC_CHECK_HEADER(Imlib2.h,have_imlib2=yes)
++		fi
+ fi	
+ 
+ AC_SUBST(IMLIB2_CFLAGS)
+@@ -55,7 +59,7 @@ if test "$GDKPIXBUF_CONFIG"x != "x"; then
  if test "$GDKPIXBUF_CONFIG"x != "x"; then
  	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
  	case "$GDKPIXBUF_VERSION" in
 -	    0.14.*) have_gdkpixbuf=yes
 +	    0.22.*) have_gdkpixbuf=yes
  		 GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
  		 GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
  		 CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
-@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,
+@@ -93,7 +97,7 @@ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
  [video_v4l=yes],[video_v4l=no])
  AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
  
 -AC_CHECK_HEADERS(machine/ioctl_bt848.h,
 +AC_CHECK_HEADERS(dev/bktr/ioctl_bt848.h,
  [video_fbsd_bttv=yes],[video_fbsd_bttv=no])
  AM_CONDITIONAL(VIDEO_FBSD_BTTV, test $video_fbsd_bttv = yes)