diff --git a/NEWS b/NEWS
index 4c04f06..d3a23b5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ This file describes changes in recent versions of genders. It
 primarily documents those changes that are of interest to users
 and admins.
 
+Changes in genders-1.30
+=======================
+ -- Fix multiple performance bottlenecks in libgenders parsing.
+
 Changes in genders-1.29
 =======================
  -- Increase internal buffer in nodeattr for large cluster hostranges.
diff --git a/configure b/configure
index 71834f0..5ca0290 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for genders 1.29.1.
+# Generated by GNU Autoconf 2.69 for genders 1.30.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='genders'
 PACKAGE_TARNAME='genders'
-PACKAGE_VERSION='1.29.1'
-PACKAGE_STRING='genders 1.29.1'
+PACKAGE_VERSION='1.30.1'
+PACKAGE_STRING='genders 1.30.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures genders 1.29.1 to adapt to many kinds of systems.
+\`configure' configures genders 1.30.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1447,7 +1447,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of genders 1.29.1:";;
+     short | recursive ) echo "Configuration of genders 1.30.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1588,7 +1588,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-genders configure 1.29.1
+genders configure 1.30.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by genders $as_me 1.29.1, which was
+It was created by genders $as_me 1.30.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3052,7 +3052,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='genders'
- VERSION='1.29.1'
+ VERSION='1.30.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3304,7 +3304,7 @@ fi
 # release, then set age to 0.
 #
 LIBGENDERS_CURRENT=3
-LIBGENDERS_REVISION=3
+LIBGENDERS_REVISION=4
 LIBGENDERS_AGE=3
 LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
 
@@ -18064,7 +18064,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by genders $as_me 1.29.1, which was
+This file was extended by genders $as_me 1.30.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18130,7 +18130,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-genders config.status 1.29.1
+genders config.status 1.30.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6f0947e..bdf78dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 ##
 # Prologue.
 ##
-AC_INIT([genders],[1.29.1])
+AC_INIT([genders],[1.30.1])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([README])
 AC_CANONICAL_TARGET
@@ -36,7 +36,7 @@ AM_MAINTAINER_MODE
 # release, then set age to 0.
 #
 LIBGENDERS_CURRENT=3
-LIBGENDERS_REVISION=3
+LIBGENDERS_REVISION=4
 LIBGENDERS_AGE=3
 LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
 AC_SUBST([LIBGENDERS_VERSION_INFO])
diff --git a/src/extensions/java/Makefile.in b/src/extensions/java/Makefile.in
index bfe5e69..1e5d24b 100644
--- a/src/extensions/java/Makefile.in
+++ b/src/extensions/java/Makefile.in
@@ -644,8 +644,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@WITH_JAVA_EXTENSIONS_FALSE@install-data-local:
 @WITH_JAVA_EXTENSIONS_FALSE@clean-local:
+@WITH_JAVA_EXTENSIONS_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
diff --git a/src/libgenders/Makefile.in b/src/libgenders/Makefile.in
index f384164..0989155 100644
--- a/src/libgenders/Makefile.in
+++ b/src/libgenders/Makefile.in
@@ -807,9 +807,8 @@ genders_query_parse.c: genders_query.c $(srcdir)/genders_query_parse.l
 genders_query.c: $(srcdir)/genders_query.y
 	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
 
-# achu: -o option in yacc/bison is not portable, use -b instead
-genders_query.tab.c: $(srcdir)/genders_query.y
-	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
+genders_query.tab.c: genders_query.c
+	touch genders_query.tab.c
 
 ../libcommon/libcommon.la: force-dependency-check
 	@cd `dirname $@` && make `basename $@`