diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index b27f79086d8..8e78a5a3816 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2002/09/13 14:17:01 brad Exp $
+# $OpenBSD: Makefile,v 1.16 2002/11/21 14:56:31 brad Exp $
 
 COMMENT=	"blackbox-derived window manager with Gnome and KDE support"
 
-VERSION=		0.1.12
+VERSION=		0.1.13
 DISTNAME=		fluxbox-${VERSION}
 PKGNAME=		${DISTNAME} #p2
 CATEGORIES=		x11
@@ -21,10 +21,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--enable-gnome --enable-kde --enable-xinerama
+CONFIGURE_STYLE=	autoconf
+AUTOCONF_NEW=		Yes
+CONFIGURE_ARGS=		--enable-kde --enable-xinerama
+USE_GMAKE=		Yes
 
 USE_X11=		Yes
 SUBST_VARS=		VERSION
 
+# Stupid GNU tools
+post-patch:
+	@cd ${WRKSRC}; touch aclocal.m4
+	@find ${WRKSRC} -name 'Makefile.in' -exec touch {} \;
+
 .include <bsd.port.mk>
diff --git a/x11/fluxbox/distinfo b/x11/fluxbox/distinfo
index 0995b326c89..98755677895 100644
--- a/x11/fluxbox/distinfo
+++ b/x11/fluxbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (fluxbox-0.1.12.tar.gz) = f90b191af969b49be3dcf901c36d5e13
-RMD160 (fluxbox-0.1.12.tar.gz) = fab2e70363f0fbedf30b98482ceb250068f43ad0
-SHA1 (fluxbox-0.1.12.tar.gz) = 53c21899f108abc9b6504404119fc82b808c390b
+MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
+RMD160 (fluxbox-0.1.13.tar.gz) = f329af0cac7fa45d9d346fd222c85b7e48e53d2b
+SHA1 (fluxbox-0.1.13.tar.gz) = 42aff39fb32e4012947a98e9266d0d168c0b108a
diff --git a/x11/fluxbox/patches/patch-configure_in b/x11/fluxbox/patches/patch-configure_in
new file mode 100644
index 00000000000..2f4c622577d
--- /dev/null
+++ b/x11/fluxbox/patches/patch-configure_in
@@ -0,0 +1,28 @@
+I think the NLS feature does not work.
+This is a patch to fix the problem.
+
+$OpenBSD: patch-configure_in,v 1.1 2002/11/21 14:56:31 brad Exp $
+--- configure.in.orig	Mon Nov 18 05:59:23 2002
++++ configure.in	Wed Nov 20 19:35:23 2002
+@@ -171,10 +171,12 @@ AC_ARG_ENABLE(nls,
+   if test x$enableval = "xyes"; then
+     AC_MSG_RESULT([yes])
+     AC_DEFINE(NLS, 1, "Natural language support")
++    NLS="-DNLS"
+   else
+     AC_MSG_RESULT([no])
+   fi,
+   AC_MSG_RESULT([yes])
++  NLS="-DNLS"
+   AC_DEFINE(NLS, 1, "Natural language support")
+ )
+ 
+@@ -184,6 +186,8 @@ AC_CHECK_PROGS(gencat_cmd, gencat)
+ if test x$gencat_cmd = "x"; then
+   NLS=""
+ fi
++
++AC_SUBST(NLS)
+ 
+ 
+ dnl Check for new timed pixmap cache
diff --git a/x11/fluxbox/pkg/PLIST b/x11/fluxbox/pkg/PLIST
index a79c8889e0a..8748fda55f3 100644
--- a/x11/fluxbox/pkg/PLIST
+++ b/x11/fluxbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/09/03 23:06:24 brad Exp $
+@comment $OpenBSD: PLIST,v 1.6 2002/11/21 14:56:31 brad Exp $
 @pkgcfl blackbox-*
 @pkgcfl openbox-*
 bin/bsetbg
@@ -24,6 +24,8 @@ share/fluxbox/nls/fr
 share/fluxbox/nls/fr_FR/blackbox.cat
 share/fluxbox/nls/it_IT/blackbox.cat
 share/fluxbox/nls/ja_JP/blackbox.cat
+share/fluxbox/nls/lv
+share/fluxbox/nls/lv_LV/blackbox.cat
 share/fluxbox/nls/pt_BR/blackbox.cat
 share/fluxbox/nls/pt_PT/blackbox.cat
 share/fluxbox/nls/ru_RU/blackbox.cat
@@ -57,6 +59,7 @@ share/fluxbox/styles/qnx-photon
 @dirrm share/fluxbox/nls/ru_RU
 @dirrm share/fluxbox/nls/pt_PT
 @dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/lv_LV
 @dirrm share/fluxbox/nls/ja_JP
 @dirrm share/fluxbox/nls/it_IT
 @dirrm share/fluxbox/nls/fr_FR