diff --git a/Makefile b/Makefile
index ec07efd0..43d95a67 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 CFLAGS += -Wmissing-prototypes -fms-extensions
 LDFLAGS += -lrt -ldl
 
-BUNDLES += docs/html docs/docresources src/webui/static
+BUNDLES += docs/html docs/docresources src/webui/static data
 
 #
 # Core
diff --git a/src/epggrab/module/opentv.c b/src/epggrab/module/opentv.c
index 5874163e..0513f1ff 100644
--- a/src/epggrab/module/opentv.c
+++ b/src/epggrab/module/opentv.c
@@ -836,7 +836,7 @@ void opentv_init ( void )
   /* Load dictionaries */
   if ((m = hts_settings_load("epggrab/opentv/dict")))
     _opentv_dict_load(m);
-  if ((m = hts_settings_load("%sdata/epggrab/opentv/dict", dr)))
+  if ((m = hts_settings_load("%s/data/epggrab/opentv/dict", dr)))
     _opentv_dict_load(m);
   tvhlog(LOG_INFO, "opentv", "dictonaries loaded");
 
diff --git a/support/dataroot/wd.c b/support/dataroot/wd.c
index 52da7f52..bda80485 100644
--- a/support/dataroot/wd.c
+++ b/support/dataroot/wd.c
@@ -7,7 +7,6 @@ const char *tvheadend_dataroot(void)
   static char cwd[256] = { 0 };
   if (!*cwd) {
     assert(getcwd(cwd, 254));
-    strcat(cwd, "/");
   }
   return cwd;
 }