diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index e7ee53f3..86fcc67e 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -2,6 +2,8 @@
 
    * configure.ac, acinclude.m4: [ 1946114 ] make AC_PROG_SED
      workaround sane (Mike Frysinger)
+   * include/jtag.h, src/cmd/detect.c, src/tap/detect.c:
+     [ 1946119 ] fixup relocatable jtag in detection (M.Frysinger)
    * src/cmd/frequency.c: ensure that cable is initialized. Fixes
      [ 1933736 ] "frequency" command segfaults without args
 
@@ -17,7 +19,7 @@
   * src/tap/parport/ftd2xx.c, src/tap/usbconn/libusb.c, src/lib/fclock.c,
     src/jtag.c, src/flash/amd_flash.c, src/flash/amd.c, src/flash/jedec.c,
     src/svf/svf.c, configure.ac, doc/UrJTAG.txt: Provide variants of
-	  usleep, frealtime, mkdir for [ 1838732 ] EXE built with MinGW
+    usleep, frealtime, mkdir for [ 1838732 ] EXE built with MinGW
 
 2008-04-11  Kolja Waschk <kawk>
 
@@ -498,7 +500,7 @@
 
    * src/bsdl/bsdl_flex.l (bsdl_flex_set_bin_x), src/bsdl/bsdl.h,
      src/bsdl/bsdl_bison.y (Init_Text): properly support COMPLIANCE_PATTERNS
-	-> fix for [ 1896382 ]
+     -> fix for [ 1896382 ]
 
 2008-02-18  Arnim Laeuger  <arniml@users.sourceforge.net>
 
diff --git a/jtag/include/jtag.h b/jtag/include/jtag.h
index 43a9a26b..f87a1598 100644
--- a/jtag/include/jtag.h
+++ b/jtag/include/jtag.h
@@ -44,7 +44,7 @@ int jtag_parse_file( chain_t *chain, const char *filename );
 int jtag_parse_line( chain_t *chain, char *line );
 int jtag_parse_stream( chain_t *chain, FILE *f );
 
-int detect_parts( chain_t *chain, char *db_path );
+int detect_parts( chain_t *chain, const char *db_path );
 int detect_register_size( chain_t *chain );
 void discovery( chain_t *chain );
 void idcode( chain_t *chain , unsigned int bytes);
diff --git a/jtag/src/cmd/detect.c b/jtag/src/cmd/detect.c
index 1e430e44..f2af309f 100644
--- a/jtag/src/cmd/detect.c
+++ b/jtag/src/cmd/detect.c
@@ -48,7 +48,7 @@ cmd_detect_run( chain_t *chain, char *params[] )
 	buses_free();
 	parts_free( chain->parts );
 	chain->parts = NULL;
-	detect_parts( chain, JTAG_DATA_DIR );
+	detect_parts( chain, jtag_get_data_dir() );
 	if (!chain->parts)
 		return 1;
 	if (!chain->parts->len) {
diff --git a/jtag/src/tap/detect.c b/jtag/src/tap/detect.c
index 49ff96d9..ef823b5d 100644
--- a/jtag/src/tap/detect.c
+++ b/jtag/src/tap/detect.c
@@ -177,7 +177,7 @@ uint64_t bits_to_uint64(tap_register *t)
 
 
 int
-detect_parts( chain_t *chain, char *db_path )
+detect_parts( chain_t *chain, const char *db_path )
 {
 	int irlen;
 	tap_register *ir;