diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index e7e481571cb..5b8a3bda6b6 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2009/09/18 10:25:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/05/24 08:48:58 espie Exp $
 
 COMMENT=		Gameboy Advance emulator
 
@@ -40,7 +40,8 @@ LIB_DEPENDS=		glademm-2.4::devel/libglademm \
 			cairo::graphics/cairo \
 			png::graphics/png
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
+AUTOCONF_VERSION=	2.59
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng \
 			-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -lm" \
diff --git a/emulators/vba/patches/patch-configure_in b/emulators/vba/patches/patch-configure_in
new file mode 100644
index 00000000000..467392368b3
--- /dev/null
+++ b/emulators/vba/patches/patch-configure_in
@@ -0,0 +1,30 @@
+$OpenBSD: patch-configure_in,v 1.1 2010/05/24 08:48:58 espie Exp $
+--- configure.in.orig	Mon May 24 10:35:00 2010
++++ configure.in	Mon May 24 10:36:15 2010
+@@ -77,26 +77,6 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ AC_STRUCT_TM
+-AC_MSG_CHECKING(for socklen_t)
+-AC_TRY_COMPILE([
+-#include <sys/socket.h>
+-socklen_t x;
+-],[
+-],[
+-AC_MSG_RESULT(yes)
+-],[
+-AC_TRY_COMPILE([
+-#include <sys/socket.h>
+-int accept (int, struct sockaddr *, size_t *);
+-],[
+-],[
+-AC_MSG_RESULT(size_t)
+-AC_DEFINE(socklen_t,size_t)
+-],[
+-AC_MSG_RESULT(int)
+-AC_DEFINE(socklen_t,int)
+-])
+-])
+ 
+ AC_C_BIGENDIAN
+