diff --git a/Makefile.am b/Makefile.am
index 2c8b8ce2..86da23fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,13 +18,17 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS), \
 
 
 if DATAFILES
+dbusdir = @DBUS_DATADIR@
+
+dbus_DATA = src/ofono.conf
+
 confdir = $(sysconfdir)/ofono
 
 conf_DATA =
 
-dbusdir = @DBUS_DATADIR@
+statedir = $(localstatedir)/lib/ofono
 
-dbus_DATA = src/ofono.conf
+state_DATA =
 endif
 
 builtin_modules =
diff --git a/README b/README
index faef78d4..3f345182 100644
--- a/README
+++ b/README
@@ -13,7 +13,8 @@ In order to compile telephony stack you need following software packages:
 	- D-Bus library
 
 To configure run:
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+	./configure --prefix=/usr --mandir=/usr/share/man \
+				--sysconfdir=/etc --localstatedir=/var
 
 Configure automatically searches for all required components and packages.
 
diff --git a/bootstrap-configure b/bootstrap-configure
index 677fb0f1..63a689af 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -9,6 +9,6 @@ fi
 		--enable-debug \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
 		--sysconfdir=/etc \
+		--localstatedir=/var \
 		--disable-datafiles $*