diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 68bffd1b..7c6f52ab 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-03  Marcel Telka  <marcel@telka.sk>
+
+	* src/Makefile.am (jtag_LDADD): Added libbrux twice to resolve dependencies.
+	* src/jtag.c: Fixed cmd.h include path.
+
 2003-06-03  Marcel Telka  <marcel@telka.sk>
 
 	* src/cmd/Makefile.am (libcmd_a_SOURCES): Removed quit.c, help.c, and detectflash.c.
diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am
index a67a0ec9..436303b6 100644
--- a/jtag/src/Makefile.am
+++ b/jtag/src/Makefile.am
@@ -56,6 +56,7 @@ jtag_LDADD = \
 	-Ltap -ltap \
 	-Lpart -lpart \
 	-Llib -ljtaglib \
+	-L../libbrux -lbrux \
 	-Lcmd -lcmd \
 	-L../libbrux -lbrux \
 	-Lbus -lbus \
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 19ffb6c7..77021b4d 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -34,9 +34,7 @@
 
 #include "chain.h"
 #include "bus.h"
-
-#include "cmd/cmd.h"
-
+#include "cmd.h"
 #include "jtag.h"
 
 #ifndef HAVE_GETLINE