diff --git a/Makefile b/Makefile
index 92a66ec10..847df3888 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ install: default
 	cp share/init.d/plinth $(DESTDIR)/etc/init.d
 	rm -f $(DESTDIR)/usr/bin/plinth
 	ln -s ../lib/python2.7/plinth/plinth.py $(DESTDIR)/usr/bin/plinth
-	mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions
+	mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run
 	cp -r data/* $(DESTDIR)/var/lib/plinth
 	rm -f $(DESTDIR)/var/lib/plinth/users/sqlite3.distrib
 
diff --git a/cfg.py b/cfg.py
index add900597..74ad88d2e 100644
--- a/cfg.py
+++ b/cfg.py
@@ -18,7 +18,7 @@ parser = SafeConfigParser(
         'pidfile':"",
         'port':"",
         })
-parser.read('plinth.config')
+parser.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'plinth.config'))
 
 product_name = parser.get('Name', 'product_name')
 box_name = parser.get('Name', 'box_name')