diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 175d4bd9..3421226d 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-05  Rutger Hofman <rfhh>
 
+  * include/urjtag/jim.h, include/urjtag/jim/some_cpu.h, src/jim/tap.c,
+    src/jim/jim_tap.c, src/jim/some_cpu.c, src/jim/intel_28f800b3.c: replace
+    calls to printf() with calls to urj_log() and urj_error_set()
+
   * include/urjtag/part.h, src/cmd/cmd_bus.c, src/cmd/cmd_detect.c,
     src/cmd/cmd_signal.c, src/bsdl/bsdl_bison.y, src/part/instruction.c,
     src/part/bsbit.c, src/part/part.c, src/part/signal.c: start replacing
diff --git a/urjtag/src/jim/Makefile.am b/urjtag/src/jim/Makefile.am
index 622fc88c..9b31bcb1 100644
--- a/urjtag/src/jim/Makefile.am
+++ b/urjtag/src/jim/Makefile.am
@@ -26,6 +26,6 @@ include $(top_srcdir)/Makefile.rules
 noinst_LTLIBRARIES = libjim.la
 
 libjim_la_SOURCES = \
-	tap.c \
+	jim_tap.c \
 	some_cpu.c \
 	intel_28f800b3.c
diff --git a/urjtag/src/jim/tap.c b/urjtag/src/jim/jim_tap.c
similarity index 100%
rename from urjtag/src/jim/tap.c
rename to urjtag/src/jim/jim_tap.c
diff --git a/urjtag/src/jim/some_cpu.c b/urjtag/src/jim/some_cpu.c
index 10765942..d81f35f4 100644
--- a/urjtag/src/jim/some_cpu.c
+++ b/urjtag/src/jim/some_cpu.c
@@ -249,7 +249,7 @@ urj_jim_some_cpu (void)
                 }
             }
 
-            if (! some_cpu_attached[i].part)      /* loop broken; failed to malloc all parts */
+            if (some_cpu_attached[i].part)      /* loop broken; failed to malloc all parts */
             {
                 for (i--; i >= 0; i--)
                     free (((urj_jim_attached_part_t *) (dev->state))[i].part);