diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index b8a0d241..e513b78d 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-01  Arnim Laeuger  <arniml>
+
+  * src/bsdl/bsdl_sem.c, THANKS: Fix bsdl bit order and safe bit
+    (Jean-Christian de Rivaz)
+
 2009-06-01  Mike Frysinger  <vapier@gentoo.org>
 
   * src/bsdl/bsdl_sem.c: add missing "length" in display (Jean-Christian de
diff --git a/urjtag/THANKS b/urjtag/THANKS
index 78779194..169e8009 100644
--- a/urjtag/THANKS
+++ b/urjtag/THANKS
@@ -68,6 +68,7 @@ Ken Parker
 Christian Pellegrin
 Laurent Pinchart
 Ramses VI
+Jean-Christian de Rivaz
 Michel Robitaille
 Hein Roehrig
 Marko Rößler
diff --git a/urjtag/src/bsdl/bsdl_sem.c b/urjtag/src/bsdl/bsdl_sem.c
index 6ec7f2ae..f443d402 100644
--- a/urjtag/src/bsdl/bsdl_sem.c
+++ b/urjtag/src/bsdl/bsdl_sem.c
@@ -271,6 +271,19 @@ bsbit_type_char (int type)
     }
 }
 
+static char
+bsbit_safe_char (int safe)
+{
+    switch (safe)
+    {
+    case 0:
+        return '0';
+    case 1:
+        return '1';
+    default:
+        return '?';
+    }
+}
 
 /*****************************************************************************
  * int urj_bsdl_process_cell_info( urj_bsdl_jtag_ctrl_t *jc )
@@ -340,8 +353,8 @@ urj_bsdl_process_cell_info (urj_bsdl_jtag_ctrl_t *jc)
                     return URJ_STATUS_FAIL;
             if (jc->proc_mode & URJ_BSDL_MODE_INSTR_PRINT)
                 urj_log (URJ_LOG_LEVEL_NORMAL,
-                         "bit %d %s %c %d %d %d %c\n", ci->bit_num,
-                         ci->port_name, bsbit_type_char (type), safe,
+                         "bit %d %c %c %s %d %d %c\n", ci->bit_num,
+                         bsbit_type_char (type), bsbit_safe_char(safe), ci->port_name,
                          ci->ctrl_bit_num, ci->disable_safe_value,
                          'Z');
         }
@@ -354,8 +367,8 @@ urj_bsdl_process_cell_info (urj_bsdl_jtag_ctrl_t *jc)
                     return URJ_STATUS_FAIL;
             if (jc->proc_mode & URJ_BSDL_MODE_INSTR_PRINT)
                 urj_log (URJ_LOG_LEVEL_NORMAL,
-                         "bit %d %s %c %d\n", ci->bit_num, ci->port_name,
-                         bsbit_type_char (type), safe);
+                         "bit %d %c %c %s\n", ci->bit_num,
+                         bsbit_type_char (type), bsbit_safe_char(safe), ci->port_name);
         }
 
         ci = ci->next;