diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 2fea4fbb2df4..a2c67076b5d1 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2006/12/07 14:21:33 rillig Exp $
+# $NetBSD: Makefile,v 1.64 2008/11/07 12:32:32 wiz Exp $
 
-DISTNAME=		bison-2.3
+DISTNAME=		bison-2.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index 5a7c29ffe33c..6e1c16f81230 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,61 +1,30 @@
-@comment $NetBSD: PLIST,v 1.15 2006/05/30 19:25:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/11/07 12:32:32 wiz Exp $
 bin/bison
 info/bison.info
 lib/liby.a
 man/man1/bison.1
+man/man1/yacc.1
 share/aclocal/bison-i18n.m4
 share/bison/README
+share/bison/bison.m4
+share/bison/c++-skel.m4
 share/bison/c++.m4
+share/bison/c-skel.m4
 share/bison/c.m4
 share/bison/glr.c
 share/bison/glr.cc
+share/bison/java-skel.m4
+share/bison/java.m4
 share/bison/lalr1.cc
+share/bison/lalr1.java
 share/bison/location.cc
+share/bison/m4sugar/foreach.m4
 share/bison/m4sugar/m4sugar.m4
+share/bison/xslt/bison.xsl
+share/bison/xslt/xml2dot.xsl
+share/bison/xslt/xml2text.xsl
+share/bison/xslt/xml2xhtml.xsl
 share/bison/yacc.c
-share/locale/da/LC_MESSAGES/bison-runtime.mo
-share/locale/da/LC_MESSAGES/bison.mo
-share/locale/de/LC_MESSAGES/bison-runtime.mo
-share/locale/de/LC_MESSAGES/bison.mo
-share/locale/es/LC_MESSAGES/bison-runtime.mo
-share/locale/es/LC_MESSAGES/bison.mo
-share/locale/et/LC_MESSAGES/bison-runtime.mo
-share/locale/et/LC_MESSAGES/bison.mo
-share/locale/fr/LC_MESSAGES/bison-runtime.mo
-share/locale/fr/LC_MESSAGES/bison.mo
-share/locale/ga/LC_MESSAGES/bison-runtime.mo
-share/locale/ga/LC_MESSAGES/bison.mo
-share/locale/hr/LC_MESSAGES/bison-runtime.mo
-share/locale/hr/LC_MESSAGES/bison.mo
-share/locale/id/LC_MESSAGES/bison-runtime.mo
-share/locale/id/LC_MESSAGES/bison.mo
-share/locale/it/LC_MESSAGES/bison-runtime.mo
-share/locale/it/LC_MESSAGES/bison.mo
-share/locale/ja/LC_MESSAGES/bison-runtime.mo
-share/locale/ja/LC_MESSAGES/bison.mo
-share/locale/ms/LC_MESSAGES/bison-runtime.mo
-share/locale/ms/LC_MESSAGES/bison.mo
-share/locale/nb/LC_MESSAGES/bison-runtime.mo
-share/locale/nb/LC_MESSAGES/bison.mo
-share/locale/nl/LC_MESSAGES/bison-runtime.mo
-share/locale/nl/LC_MESSAGES/bison.mo
-share/locale/pl/LC_MESSAGES/bison-runtime.mo
-share/locale/pl/LC_MESSAGES/bison.mo
-share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
-share/locale/pt_BR/LC_MESSAGES/bison.mo
-share/locale/ro/LC_MESSAGES/bison-runtime.mo
-share/locale/ro/LC_MESSAGES/bison.mo
-share/locale/ru/LC_MESSAGES/bison-runtime.mo
-share/locale/ru/LC_MESSAGES/bison.mo
-share/locale/rw/LC_MESSAGES/bison-runtime.mo
-share/locale/rw/LC_MESSAGES/bison.mo
-share/locale/sl/LC_MESSAGES/bison-runtime.mo
-share/locale/sv/LC_MESSAGES/bison-runtime.mo
-share/locale/sv/LC_MESSAGES/bison.mo
-share/locale/tr/LC_MESSAGES/bison-runtime.mo
-share/locale/tr/LC_MESSAGES/bison.mo
-share/locale/vi/LC_MESSAGES/bison-runtime.mo
-share/locale/vi/LC_MESSAGES/bison.mo
-share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+@dirrm share/bison/xslt
 @dirrm share/bison/m4sugar
 @dirrm share/bison
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 8a0e4f3dcab1..92199b80cafe 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2006/06/11 13:59:56 wiz Exp $
+$NetBSD: distinfo,v 1.20 2008/11/07 12:32:32 wiz Exp $
 
-SHA1 (bison-2.3.tar.bz2) = 7e489f35c6d8171f0cb0cad3dda0fb39f2cb0b62
-RMD160 (bison-2.3.tar.bz2) = c6a116d6b763fad3f4df6e303943e09ed080cb26
-Size (bison-2.3.tar.bz2) = 1080319 bytes
-SHA1 (patch-aa) = 48ae980971419ede0a45dc5aac7d302586d3826e
+SHA1 (bison-2.4.tar.bz2) = 32c959200e630d3185f24d661c8f12de67b38684
+RMD160 (bison-2.4.tar.bz2) = 979d293bdf979c0bd21da631fa21581710734345
+Size (bison-2.4.tar.bz2) = 1472671 bytes
+SHA1 (patch-aa) = dbc64816b60aebba81125aea0cdc8bb648aa114f
diff --git a/devel/bison/patches/patch-aa b/devel/bison/patches/patch-aa
index b58cd2bce0fb..f3706af6954d 100644
--- a/devel/bison/patches/patch-aa
+++ b/devel/bison/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2003/01/01 13:15:48 cjep Exp $
+$NetBSD: patch-aa,v 1.10 2008/11/07 12:32:32 wiz Exp $
 
---- src/Makefile.in.orig	Wed Jan  1 09:06:42 2003
+--- src/Makefile.in.orig	2008-11-02 21:59:45.000000000 +0000
 +++ src/Makefile.in
-@@ -573,9 +573,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -913,9 +913,9 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  
  yacc:
 -	echo '#! /bin/sh' >$@
--	echo 'exec $(bindir)/bison -y "$$@"' >>$@
+-	echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
 -	chmod a+x $@
 +#	echo '#! /bin/sh' >$@
-+#	echo 'exec $(bindir)/bison -y "$$@"' >>$@
++#	echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
 +#	chmod a+x $@
  
  echo: