diff --git a/configure.ac b/configure.ac
index 55b60bd..1949a7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl SPDX-License-Identifier: Apache-2.0
 dnl Author: Robert Balas <balasr@iis.ee.ethz.ch>
-AC_INIT([trdb], [0.1], [balasr@iis.ee.ethz.ch])
+AC_INIT([trdb], [0.2], [balasr@iis.ee.ethz.ch])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 AC_PROG_CC
 AC_PROG_RANLIB
diff --git a/include/disassembly.h b/include/disassembly.h
index 97f25a7..f87fcf3 100644
--- a/include/disassembly.h
+++ b/include/disassembly.h
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#define PACKAGE "foo" /* quick hack for bfd if not using autotools */
+#include "config.h"
 #include "bfd.h"
 #include "demangle.h"
 #include "dis-asm.h"
diff --git a/include/trace_debugger.h b/include/trace_debugger.h
index a11cbc4..a78a2ed 100644
--- a/include/trace_debugger.h
+++ b/include/trace_debugger.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#define PACKAGE "foo" /* quick hack for bfd if not using autotools */
+#include "config.h"
 #include <stdbool.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/src/disassembly.c b/src/disassembly.c
index 0acec7a..8ce3a40 100644
--- a/src/disassembly.c
+++ b/src/disassembly.c
@@ -24,7 +24,6 @@
  * libbfd. Reuses and changes alot of code from GNU objdump.
  */
 
-#define PACKAGE "foo" /* quick hack for bfd if not using autotools */
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,6 +37,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include "config.h"
 #include "filenames.h"
 #include "disassembly.h"
 #include "disassembly_private.h"
diff --git a/src/trdb.c b/src/trdb.c
index b758ba1..7299281 100644
--- a/src/trdb.c
+++ b/src/trdb.c
@@ -19,11 +19,10 @@
 
 /*
  * Author: Robert Balas (balasr@student.ethz.ch)
- * Description: trdb -- trace debugger tools for the  PULP platform, compress
+ * Description: trdb -- Trace Debugger Tools for RISC-V E-Trace, compress
  * and decompress instruction traces
  */
 
-#define PACKAGE "foo" /* quick hack for bfd if not using autotools */
 #include <stdio.h>
 #include <stdlib.h>
 #include <argp.h>
@@ -31,6 +30,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <sys/queue.h>
+#include "config.h"
 #include "bfd.h"
 #include "utils.h"
 #include "trace_debugger.h"
@@ -39,10 +39,10 @@
 
 #define TRDB_NUM_ARGS 1
 
-const char *argp_program_version     = "trdb 0.1";
-const char *argp_program_bug_address = "<balasr@student.ethz.ch>";
+const char *argp_program_version     = PACKAGE_STRING;
+const char *argp_program_bug_address = PACKAGE_BUGREPORT;
 
-static char doc[]      = "trdb -- trace debugger tools for the PULP platform";
+static char doc[]      = "trdb -- Trace Debugger Tools for RISC-V E-Trace";
 static char args_doc[] = "TRACE-OR-PACKETS";
 
 #define TRDB_OPT_DEMANGLE 1