diff --git a/build.gradle b/build.gradle
index d3876ef0..74c24be2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,6 +90,13 @@ distributions {
             from 'logging.properties'
             from 'run.sh'
 
+            if (file('hal.conf').exists()) {
+                from 'hal.conf'
+            }
+            if (file('hal.db').exists()) {
+                from 'hal.db'
+            }
+
             // from subprojects
             project.subprojects.each { subProject ->
                 into('bin') {
diff --git a/hal-core/src/se/hal/HalContext.java b/hal-core/src/se/hal/HalContext.java
index c5b313be..0483d0f9 100644
--- a/hal-core/src/se/hal/HalContext.java
+++ b/hal-core/src/se/hal/HalContext.java
@@ -58,6 +58,8 @@ public class HalContext {
 
     public static final String RUNTIME_ROOT;
     static {
+        logger.info("Runtime folder: " + new File("").getAbsolutePath());
+
         if (FileUtil.find("build/install/Hal") != null) // Development environment
             RUNTIME_ROOT = "build/install/Hal";
         else
@@ -95,7 +97,7 @@ public class HalContext {
                 fileConf.load(in);
                 in.close();
             } else {
-                logger.info("No hal.conf file found");
+                logger.info("No hal.conf file found at: " + CONF_FILE);
             }
 
             // Init DB