diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 67180474..8e390d5b 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,7 @@
 2009-03-28  Arnim Laeuger  <arniml>
 
+  * src/tap/chain.c: [ 2610857 ] chain_set_pod_signal() looks funky
+
   * UrJTAG.txt: typo
 
 2009-03-28  Arnim Laeuger  <arniml>
diff --git a/jtag/src/tap/chain.c b/jtag/src/tap/chain.c
index fae3ded2..6b94b43f 100644
--- a/jtag/src/tap/chain.c
+++ b/jtag/src/tap/chain.c
@@ -105,8 +105,8 @@ chain_defer_clock( chain_t *chain, int tms, int tdi, int n )
 int
 chain_set_trst( chain_t *chain, int trst )
 {
-	int old_trst = cable_set_signal( chain->cable, CS_TRST, trst ? CS_TRST : 0 );
-	old_trst = (old_trst & CS_TRST) ? 1 : 0;
+	int old_val = cable_set_signal( chain->cable, CS_TRST, trst ? CS_TRST : 0 );
+	int old_trst = (old_val & CS_TRST) ? 1 : 0;
 	tap_state_set_trst( chain, old_trst, trst );
 	return trst;
 }
@@ -121,8 +121,8 @@ int
 chain_set_pod_signal( chain_t *chain, int mask, int val )
 {
 	int old_val = cable_set_signal( chain->cable, mask, val );
-	int old_trst = (old_trst & CS_TRST) ? 1 : 0;
-    int new_trst = (val & mask & CS_TRST)  ? 1 : 0;
+	int old_trst = (old_val & CS_TRST) ? 1 : 0;
+	int new_trst = (val & mask & CS_TRST)  ? 1 : 0;
 	tap_state_set_trst( chain, old_trst, new_trst );
 	return old_val;
 }