diff --git a/src/Makefile.am b/src/Makefile.am
index f74e424..2485b57 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,13 @@ EXTRA_DIST = manager.xml device.xml fprintd-marshal.list
 libexec_PROGRAMS = fprintd
 noinst_LTLIBRARIES = libfprintd.la
 
-AM_CFLAGS = $(WARN_CFLAGS) $(FPRINT_CFLAGS) $(DAEMON_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\" -DPLUGINDIR=\""$(libdir)/fprintd/modules"\"
+AM_CFLAGS =						\
+	$(WARN_CFLAGS)					\
+	$(FPRINT_CFLAGS)				\
+	$(DAEMON_CFLAGS)				\
+	-DLOCALEDIR=\""$(datadir)/locale"\"		\
+	-DPLUGINDIR=\""$(libdir)/fprintd/modules"\"	\
+	-DFILE_STORAGE_PATH=\""$(localstatedir)/lib/fprint"\"
 
 libfprintd_la_SOURCES =				\
 	manager.c device.c			\
diff --git a/src/file_storage.c b/src/file_storage.c
index 78b53af..6b153ef 100644
--- a/src/file_storage.c
+++ b/src/file_storage.c
@@ -41,10 +41,6 @@
 
 #define DIR_PERMS 0700
 
-#ifndef FILE_STORAGE_PATH
-#define FILE_STORAGE_PATH "/var/lib/fprint/"
-#endif
-
 #define FP_FINGER_IS_VALID(finger) \
 	((finger) >= LEFT_THUMB && (finger) <= RIGHT_LITTLE)