diff --git a/configuration.go b/configuration.go
index 7e03031..efa16de 100644
--- a/configuration.go
+++ b/configuration.go
@@ -133,7 +133,7 @@ func InitializeConfiguration(configurationFile string, enableWebInterface bool)
 		if err != nil {
 			return configuration, err
 		}
-		log.Printf("⚙ Configuration %v loaded", configuration.ConfigurationFile)
+		log.Printf("⚙ Configuration %v/%v loaded", getWorkingDirectory(), configuration.ConfigurationFile)
 	} else {
 		// write default config to disk
 		configuration.initializeDefaults()
@@ -165,7 +165,7 @@ func (configuration *Configuration) Write() error {
 		log.Debugf("⚙ Configuration hasn't changed. Omitting write.")
 		return nil
 	}
-	log.Debugf("⚙ Configuration changed. Saving...")
+	log.Debugf("⚙ Configuration changed. Saving to %v/%v", getWorkingDirectory(), configuration.ConfigurationFile)
 	json, err := json.MarshalIndent(configuration, "", "  ")
 	if err != nil {
 		return err
diff --git a/kelvin.go b/kelvin.go
index 41925f3..f541346 100644
--- a/kelvin.go
+++ b/kelvin.go
@@ -43,6 +43,7 @@ func main() {
 	flag.Parse()
 	configureLogging()
 	log.Printf("Kelvin %v starting up... 🚀", applicationVersion)
+	log.Debugf("Current working directory: %v", getWorkingDirectory())
 	go CheckForUpdate(applicationVersion, *forceUpdate)
 	go validateSystemTime()
 	go handleSIGHUP()
diff --git a/util.go b/util.go
index 1439b09..df0276f 100644
--- a/util.go
+++ b/util.go
@@ -26,6 +26,7 @@ import "os/exec"
 import "os"
 import "fmt"
 import "math"
+import "path/filepath"
 
 func containsString(slice []string, element string) bool {
 	for _, current := range slice {
@@ -102,3 +103,11 @@ func Restart() {
 	cmd.Start()
 	os.Exit(0)
 }
+
+func getWorkingDirectory() string {
+	ex, err := os.Executable()
+	if err != nil {
+		return ""
+	}
+	return filepath.Dir(ex)
+}