diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 5f1e8750..24be72e2 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -9,6 +9,9 @@
   * include/urjtag/xpcu.h: Remove unused header.
   * include/urjtag/urjtag.h.in, include/urjtag/Makefile.am: Remove xpcu.h.
 
+  * src/tap/detect.c (urj_tap_detect_parts): Only pad hex output to the actual
+    register size rather than always 64 bits.
+
 2010-01-24  Arnim Laeuger  <arniml>
 
   * src/tap/usbconn/libftd2xx.c: const urj_tap_usbconn_ftd2xx_driver
diff --git a/urjtag/src/tap/detect.c b/urjtag/src/tap/detect.c
index 7575522b..cb867799 100644
--- a/urjtag/src/tap/detect.c
+++ b/urjtag/src/tap/detect.c
@@ -264,8 +264,9 @@ urj_tap_detect_parts (urj_chain_t *chain, const char *db_path)
             id->data[0] = 1;
             did = id;
 
-            urj_log (URJ_LOG_LEVEL_NORMAL, _("Device Id: %s (0x%016" PRIX64 ")\n"),
-                     urj_tap_register_get_string (did), urj_tap_register_get_value (did));
+            urj_log (URJ_LOG_LEVEL_NORMAL, _("Device Id: %s (0x%0*" PRIX64 ")\n"),
+                     urj_tap_register_get_string (did), did->len / 4,
+                     urj_tap_register_get_value (did));
         } else
             urj_log (URJ_LOG_LEVEL_NORMAL, _("Device Id: unknown as bit 0 was not a 1\n"));