diff --git a/ChangeLog b/ChangeLog
index af99cd7eb..ea59d291a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-27 Paulo Andrade <pcpa@gnu.org>
+
+	* include/lightning/jit_private.h, lib/jit_disasm.c,
+	lib/lightning.c: Remove the global jit_progname variable.
+	It was being only used in jit_init_debug, that is called
+	from init_jit, so, just pass an argument.
+
 2014-07-27 Paulo Andrade <pcpa@gnu.org>
 
 	* doc/body.texi: Add note that jit_set_memory_functions
diff --git a/include/lightning/jit_private.h b/include/lightning/jit_private.h
index c20845696..8de2c8b0e 100644
--- a/include/lightning/jit_private.h
+++ b/include/lightning/jit_private.h
@@ -582,7 +582,7 @@ _emit_ldxi_d(jit_state_t*, jit_int32_t, jit_int32_t, jit_word_t);
 extern void
 _emit_stxi_d(jit_state_t*, jit_word_t, jit_int32_t, jit_int32_t);
 
-extern void jit_init_debug(void);
+extern void jit_init_debug(char*);
 extern void jit_finish_debug(void);
 
 extern void jit_init_note(void);
@@ -620,6 +620,5 @@ jit_get_max_instr(void);
  * Externs
  */
 extern jit_register_t	 _rvs[];
-extern const char	*jit_progname;
 
 #endif /* _jit_private_h */
diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c
index a54bc257b..a56e8b63c 100644
--- a/lib/jit_disasm.c
+++ b/lib/jit_disasm.c
@@ -57,12 +57,12 @@ static jit_state_t		 *disasm_jit;
  * Implementation
  */
 void
-jit_init_debug(void)
+jit_init_debug(char *progname)
 {
 #if DISASSEMBLER
     bfd_init();
 
-    disasm_bfd = bfd_openr(jit_progname, NULL);
+    disasm_bfd = bfd_openr(progname, NULL);
     assert(disasm_bfd);
     bfd_check_format(disasm_bfd, bfd_object);
     bfd_check_format(disasm_bfd, bfd_archive);
diff --git a/lib/lightning.c b/lib/lightning.c
index fa7743036..9a6d16f75 100644
--- a/lib/lightning.c
+++ b/lib/lightning.c
@@ -170,7 +170,6 @@ _patch_register(jit_state_t *jit, jit_node_t *node, jit_node_t *link,
 /*
  * Initialization
  */
-const char	*jit_progname;
 #if !defined(__sgi)
 #define  mmap_fd			-1
 #endif
@@ -181,9 +180,8 @@ const char	*jit_progname;
 void
 init_jit(char *progname)
 {
-    jit_progname = progname;
     jit_get_cpu();
-    jit_init_debug();
+    jit_init_debug(progname);
     jit_init_size();
 }