diff --git a/sys-apps/guix/guix-0.12.0-r1.ebuild b/sys-apps/guix/guix-0.12.0-r2.ebuild
similarity index 95%
rename from sys-apps/guix/guix-0.12.0-r1.ebuild
rename to sys-apps/guix/guix-0.12.0-r2.ebuild
index 1cdbf8f1567fb..5acef2960892d 100644
--- a/sys-apps/guix/guix-0.12.0-r1.ebuild
+++ b/sys-apps/guix/guix-0.12.0-r2.ebuild
@@ -97,6 +97,12 @@ pkg_setup() {
 	done
 }
 
+src_configure() {
+	# to be compatible with guix from /gnu/store
+	econf \
+		--localstatedir="${EPREFIX}"/var
+}
+
 src_prepare() {
 	copy_boot_guile_binaries
 
@@ -116,6 +122,7 @@ src_install() {
 
 	readme.gentoo_create_doc
 
+	keepdir                /etc/guix
 	# TODO: will need a tweak for prefix
 	keepdir                /gnu/store
 	fowners root:guixbuild /gnu/store