diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 6276578e..6599a033 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-21  Marcel Telka  <marcel@telka.sk>
+
+	* src/jtag.c (main): Added conditional compilation for l10n.
+
 2003-02-20  Marcel Telka  <marcel@telka.sk>
 
 	* src/Makefile.am (jtag_SOURCES): Added missing flash.h.
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 9064902d..5fc574e5 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -807,10 +807,12 @@ jtag_parse_rc( void )
 int
 main( void )
 {
+#ifdef ENABLE_NLS
 	/* l10n support */
 	setlocale( LC_MESSAGES, "" );
 	bindtextdomain( PACKAGE, LOCALEDIR );
 	textdomain( PACKAGE );
+#endif /* ENABLE_NLS */
 
 	printf(
 			"%s\n"