diff -Naur opendnssec-1.4.0a3.old/Makefile.am opendnssec-1.4.0a3/Makefile.am
--- opendnssec-1.4.0a3.old/Makefile.am	2012-07-17 08:53:51.000000000 +0200
+++ opendnssec-1.4.0a3/Makefile.am	2012-08-15 11:38:18.000000000 +0200
@@ -28,14 +28,12 @@
 
 
 install-data-hook:
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_LOCALSTATE_DIR@
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_LOCALSTATE_DIR@/tmp
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_LOCALSTATE_DIR@/signconf
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_LOCALSTATE_DIR@/unsigned
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_LOCALSTATE_DIR@/signed
+	$(INSTALL) -d $(DESTDIR)@OPENDNSSEC_PID_DIR@
 
 docs:
 	(cd libhsm; $(MAKE) doxygen)
diff -Naur opendnssec-1.4.0a3.old/conf/Makefile.am opendnssec-1.4.0a3/conf/Makefile.am
--- opendnssec-1.4.0a3.old/conf/Makefile.am	2012-01-26 23:00:03.000000000 +0100
+++ opendnssec-1.4.0a3/conf/Makefile.am	2012-08-15 12:05:48.000000000 +0200
@@ -10,8 +10,8 @@
 TRANG=		$(srcdir)/trang/trang.jar
 TRANG_URL	"https://code.google.com/p/jing-trang/"
 
-sysconfdir = @sysconfdir@/opendnssec
-datadir = @datadir@/opendnssec
+sysconfdir = @OPENDNSSEC_SYSCONF_DIR@
+datadir = @OPENDNSSEC_DATA_DIR@
 
 noinst_DATA = ${XML} ${XSL}
 
diff -Naur opendnssec-1.4.0a3.old/conf/conf.rnc opendnssec-1.4.0a3/conf/conf.rnc
--- opendnssec-1.4.0a3.old/conf/conf.rnc	2012-03-20 15:22:00.000000000 +0100
+++ opendnssec-1.4.0a3/conf/conf.rnc	2012-08-15 12:14:55.000000000 +0200
@@ -103,7 +103,7 @@
 		privs?,
 
 		# Location to store intermediate zone information
-		# DEFAULT: $(localstatedir)/opendnssec/tmp
+		# DEFAULT: @OPENDNSSEC_LOCALSTATE_DIR@/tmp
 		element WorkingDirectory { xsd:string }?,
 
 		# Number of Worker Threads
diff -Naur opendnssec-1.4.0a3.old/conf/conf.rng opendnssec-1.4.0a3/conf/conf.rng
--- opendnssec-1.4.0a3.old/conf/conf.rng	2012-08-08 14:15:14.000000000 +0200
+++ opendnssec-1.4.0a3/conf/conf.rng	2012-08-15 12:14:38.000000000 +0200
@@ -152,7 +152,7 @@
           <optional>
             <!--
               Location to store intermediate zone information
-              DEFAULT: $(localstatedir)/opendnssec/tmp
+              DEFAULT: @OPENDNSSEC_LOCALSTATE_DIR@/tmp
             -->
             <element name="WorkingDirectory">
               <data type="string"/>
diff -Naur opendnssec-1.4.0a3.old/enforcer/utils/Makefile.am opendnssec-1.4.0a3/enforcer/utils/Makefile.am
--- opendnssec-1.4.0a3.old/enforcer/utils/Makefile.am	2012-07-04 15:14:13.000000000 +0200
+++ opendnssec-1.4.0a3/enforcer/utils/Makefile.am	2012-08-15 12:09:17.000000000 +0200
@@ -18,7 +18,7 @@
 	@DB_INCLUDES@ \
 	@LDNS_INCLUDES@
 
-opendnssecdatadir = $(datadir)/opendnssec
+opendnssecdatadir = @OPENDNSSEC_DATA_DIR@
 
 if USE_MYSQL
 dist_opendnssecdata_DATA = database_create.mysql
diff -Naur opendnssec-1.4.0a3.old/enforcer/utils/convert_database.pl opendnssec-1.4.0a3/enforcer/utils/convert_database.pl
--- opendnssec-1.4.0a3.old/enforcer/utils/convert_database.pl	2012-07-04 15:14:13.000000000 +0200
+++ opendnssec-1.4.0a3/enforcer/utils/convert_database.pl	2012-08-15 13:16:41.000000000 +0200
@@ -534,6 +534,6 @@
 
 This example converts from a SQLite to a MySQL database using default installation paths:
 
-convert_database.pl --from dbi:SQLite:dbname=/var/opendnssec/kasp.db --to dbi:mysql:database=kasp;host=localhost --to-username kasp --to-password kasp
+convert_database.pl --from dbi:SQLite:dbname=/var/lib/opendnssec/kasp.db --to dbi:mysql:database=kasp;host=localhost --to-username kasp --to-password kasp
 
 =cut
diff -Naur opendnssec-1.4.0a3.old/m4/opendnssec_common.m4 opendnssec-1.4.0a3/m4/opendnssec_common.m4
--- opendnssec-1.4.0a3.old/m4/opendnssec_common.m4	2012-02-21 15:12:17.000000000 +0100
+++ opendnssec-1.4.0a3/m4/opendnssec_common.m4	2012-08-14 17:15:30.000000000 +0200
@@ -18,7 +18,7 @@
 OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
 OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
 OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
-OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
 OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
 
 AC_SUBST([OPENDNSSEC_BIN_DIR])
diff -Naur opendnssec-1.4.0a3.old/plugins/eppclient/src/Makefile.am opendnssec-1.4.0a3/plugins/eppclient/src/Makefile.am
--- opendnssec-1.4.0a3.old/plugins/eppclient/src/Makefile.am	2011-09-13 13:55:49.000000000 +0200
+++ opendnssec-1.4.0a3/plugins/eppclient/src/Makefile.am	2012-08-15 12:11:10.000000000 +0200
@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-sysconfdir =	@sysconfdir@/opendnssec
+sysconfdir =	@OPENDNSSEC_SYSCONF_DIR@
 
 AM_CPPFLAGS =	-I$(srcdir)/.. \
 		@LDNS_INCLUDES@ @XML2_INCLUDES@ \
diff -Naur opendnssec-1.4.0a3.old/signer/src/Makefile.am opendnssec-1.4.0a3/signer/src/Makefile.am
--- opendnssec-1.4.0a3.old/signer/src/Makefile.am	2012-06-04 12:11:42.000000000 +0200
+++ opendnssec-1.4.0a3/signer/src/Makefile.am	2012-08-15 12:03:21.000000000 +0200
@@ -13,8 +13,6 @@
 	@XML2_INCLUDES@ \
 	@LDNS_INCLUDES@
 
-signerdir =     @libdir@/opendnssec/signer
-
 sbin_PROGRAMS = ods-signerd ods-signer
 # man8_MANS =     man/ods-signer.8 man/ods-signerd.8