diff --git a/Makefile b/Makefile
index 5921195..4b95bad 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install:
 
 	install doorlockd gpio-wait doorstate $(BIN)
 	install doorlockd-passwd $(BIN)
-	install -m 0644 doorlockd.cfg $(ETC)
+	install -m 0644 etc/doorlockd.cfg $(ETC)
 	install -m 0644 systemd/doorlockd.service systemd/doorstate.service $(SYSTEMD_UNITS)
 
 	pip install --upgrade --force-reinstall --root=$(DESTDIR) .
diff --git a/doorlockd b/doorlockd
index 9fcfb28..0e3fd98 100755
--- a/doorlockd
+++ b/doorlockd
@@ -28,7 +28,7 @@ from pydoorlock.WebApp import webapp_run, emit_doorstate
 from pydoorlock.Doorlock import DoorlockResponse, DoorHandler
 from pydoorlock.Config import Config
 
-SYSCONFDIR = '.'
+SYSCONFDIR = './etc'
 PREFIX = '.'
 
 __author__ = 'Ralf Ramsauer'
diff --git a/doorlockd.cfg b/etc/doorlockd.cfg
similarity index 100%
rename from doorlockd.cfg
rename to etc/doorlockd.cfg