diff --git a/www/fcgi-cgi/Makefile b/www/fcgi-cgi/Makefile
index e65a5f80440..2bedf05e8fc 100644
--- a/www/fcgi-cgi/Makefile
+++ b/www/fcgi-cgi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/11 11:44:41 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2013/03/28 23:40:56 brad Exp $
 
 COMMENT-main=	wrapper to run CGI applications via FastCGI
 COMMENT-static=	static-linked fcgi-cgi wrapper for chroot use
@@ -23,6 +23,11 @@ MASTER_SITES=	http://cgit.lighttpd.net/fcgi-cgi.git/snapshot/ \
 SEPARATE_BUILD=	Yes
 MULTI_PACKAGES=	-main -static
 
+AUTOCONF_VERSION= 2.68
+AUTOMAKE_VERSION= 1.11
+
+BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
+		${MODGNU_AUTOMAKE_DEPENDS}
 RUN_DEPENDS=	www/spawn-fcgi
 RUN_DEPENDS-static= www/fcgi-cgi,-main
 LIB_DEPENDS=	devel/libev \
@@ -30,13 +35,11 @@ LIB_DEPENDS=	devel/libev \
 
 MODULES=	devel/gettext
 
-CONFIGURE_STYLE= autoconf automake
-AUTOCONF_VERSION= 2.68
-AUTOMAKE_VERSION= 1.11
+CONFIGURE_STYLE= gnu
 PREFIX-static=	/var/www/${TRUEPREFIX}
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
diff --git a/www/fcgi-cgi/distinfo b/www/fcgi-cgi/distinfo
index 967595985b4..a6cf212fdbb 100644
--- a/www/fcgi-cgi/distinfo
+++ b/www/fcgi-cgi/distinfo
@@ -1,5 +1,2 @@
-MD5 (fcgi-cgi-0.1.8.tar.gz) = G4fqh/ZatLbdmPkkotqkGA==
-RMD160 (fcgi-cgi-0.1.8.tar.gz) = 5Ezt4CrNHBjdcJKn3x0xA2wciqk=
-SHA1 (fcgi-cgi-0.1.8.tar.gz) = I6dcEzvnB1yh/6YLFhDB8eXOWYk=
 SHA256 (fcgi-cgi-0.1.8.tar.gz) = aOpA/9NpQEUUVRt3DLUrTpC8RWy59Hx+Ddm06q+21Nc=
 SIZE (fcgi-cgi-0.1.8.tar.gz) = 14041
diff --git a/www/fcgi-cgi/patches/patch-Makefile_am b/www/fcgi-cgi/patches/patch-Makefile_am
index 6a46404b131..f7bc379b208 100644
--- a/www/fcgi-cgi/patches/patch-Makefile_am
+++ b/www/fcgi-cgi/patches/patch-Makefile_am
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_am,v 1.2 2012/08/30 13:47:45 sthen Exp $
---- Makefile.am.orig	Thu Oct 28 22:43:23 2010
-+++ Makefile.am	Tue Apr 10 15:47:59 2012
+$OpenBSD: patch-Makefile_am,v 1.3 2013/03/28 23:40:56 brad Exp $
+--- Makefile.am.orig	Thu Oct 28 17:43:23 2010
++++ Makefile.am	Thu Mar 28 18:27:25 2013
 @@ -4,5 +4,9 @@ man1_MANS=fcgi-cgi.1
  AM_CFLAGS=$(GLIB_CFLAGS)
  fcgi_cgi_LDADD=$(GLIB_LIBS)
@@ -9,6 +9,6 @@ $OpenBSD: patch-Makefile_am,v 1.2 2012/08/30 13:47:45 sthen Exp $
 +bin_PROGRAMS=fcgi-cgi fcgi-cgi-static
  fcgi_cgi_SOURCES=fastcgi.c fcgi-cgi.c
 +
-+fcgi_cgi_static_LDADD=$(fcgi_cgi_LDADD)
-+fcgi_cgi_static_LDFLAGS=-static `pkg-config glib-2.0 --libs --static`
++fcgi_cgi_static_LDADD=$(GLIB_LIBS_STATIC)
++fcgi_cgi_static_LDFLAGS=-static
 +fcgi_cgi_static_SOURCES=$(fcgi_cgi_SOURCES)
diff --git a/www/fcgi-cgi/patches/patch-configure_ac b/www/fcgi-cgi/patches/patch-configure_ac
index 7a5a11174db..6d2382faf89 100644
--- a/www/fcgi-cgi/patches/patch-configure_ac
+++ b/www/fcgi-cgi/patches/patch-configure_ac
@@ -1,7 +1,13 @@
-$OpenBSD: patch-configure_ac,v 1.1 2012/04/10 19:34:52 sthen Exp $
---- configure.ac.orig	Tue Apr 10 15:49:39 2012
-+++ configure.ac	Tue Apr 10 15:49:32 2012
-@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0, [
+$OpenBSD: patch-configure_ac,v 1.2 2013/03/28 23:40:56 brad Exp $
+--- configure.ac.orig	Thu Oct 28 17:43:23 2010
++++ configure.ac	Thu Mar 28 18:57:58 2013
+@@ -19,10 +19,13 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0, [
+   AC_DEFINE([HAVE_GLIB_H], [1], [glib.h])
+ ],[AC_MSG_ERROR("glib-2.0 >= 2.16.0 not found")])
+ 
++GLIB_LIBS_STATIC=`$PKG_CONFIG --libs --static glib-2.0`
++AC_SUBST(GLIB_LIBS_STATIC)
++
  # lib ev
  AC_CHECK_HEADERS([ev.h], [], [AC_MSG_ERROR("ev.h not found")])
  AC_CHECK_LIB([ev], [ev_time], [