diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 10558e1c..1d8c87ab 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-27  Mike Frysinger  <vapier@gentoo.org>
+
+  * src/bsdl/Makefile.am, src/svf/Makefile.am: Update dependency targets
+    to fix parallel build issues with bison/flex generated headers.
+
 2011-06-27  Jie Zhang  <jie.zhang@analog.com>
 
   * include/urjtag/Makefile.am (pkginclude_HEADERS): Remove urjtag.h.
diff --git a/urjtag/src/bsdl/Makefile.am b/urjtag/src/bsdl/Makefile.am
index a9ec61d2..82cd5f07 100644
--- a/urjtag/src/bsdl/Makefile.am
+++ b/urjtag/src/bsdl/Makefile.am
@@ -53,12 +53,13 @@ libbsdl_flex_la_CFLAGS = \
 # additional dependencies
 # - *_flex files must be processed after their *_bison counterparts
 #   to ensure that *_bison.h is present
-libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h
-libbsdl_flex_la-bsdl_flex.$(OBJEXT): bsdl_bison.h
-bsdl_sem.$(OBJEXT): bsdl_bison.h
-
-vhdl_bison.h: vhdl_bison.c
-bsdl_bison.h: bsdl_bison.c
+# - we use variables to workaround automake rule/dependency limitations
+VHDL_BISON_OBJS = libbsdl_flex_la-vhdl_flex.lo
+BSDL_BISON_OBJS = libbsdl_flex_la-bsdl_flex.lo bsdl_sem.lo
+$(VHDL_BISON_OBJS): vhdl_bison.h
+$(BSDL_BISON_OBJS): bsdl_bison.h
+vhdl_bison.h: vhdl_bison.c ; @true
+bsdl_bison.h: bsdl_bison.c ; @true
 
 AM_LFLAGS = -i
 
diff --git a/urjtag/src/svf/Makefile.am b/urjtag/src/svf/Makefile.am
index 836183d7..b630a040 100644
--- a/urjtag/src/svf/Makefile.am
+++ b/urjtag/src/svf/Makefile.am
@@ -35,15 +35,19 @@ libsvf_la_SOURCES = \
 libsvf_flex_la_SOURCES = \
 	svf_flex.l
 
-libsvf_flex_la-svf_flex.$(OBJEXT) svf.$(OBJEXT): svf_bison.h
-
 AM_CFLAGS = $(WARNINGCFLAGS)
 
 libsvf_flex_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-Wno-error
 
-svf_bison.h: svf_bison.c
+# additional dependencies
+# - *_flex files must be processed after their *_bison counterparts
+#   to ensure that *_bison.h is present
+# - we use variables to workaround automake rule/dependency limitations
+SVF_BISON_OBJS = libsvf_flex_la-svf_flex.lo svf.lo
+$(SVF_BISON_OBJS): svf_bison.h
+svf_bison.h: svf_bison.c ; @true
 
 MAINTAINERCLEANFILES = \
 	svf_bison.c \