3 files changed, 4 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ed0ec95a7ee..42880e34d965 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = emacs-openrc
 	pkgdesc = OpenRC emacs-daemon init script
 	pkgver = 1.0
-	pkgrel = 3
+	pkgrel = 4
 	install = emacs-openrc.install
 	changelog = CHANGELOG
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 3c1f841ba870..e6effa62970f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname="emacs-openrc"
 pkgver="1.0"
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenRC emacs-daemon init script"
 arch=('i686' 'x86_64')
 license=('GPL3')
diff --git a/emacs-openrc.install b/emacs-openrc.install
index 886b5b4b53e4..1435068e8290 100644
--- a/emacs-openrc.install
+++ b/emacs-openrc.install
@@ -3,14 +3,14 @@ SERVICE_NAME_USER=emacs.$SUDO_USER
 DEFAULT_CONF_PATH=/etc/conf.d/$SERVICE_NAME_USER
 EMACS_DAEMON_PATH=/etc/init.d/$SERVICE_NAME
 EMACS_DAEMON_USER_PATH=$EMACS_DAEMON_PATH.$SUDO_USER
-VARS_EXPORTED="SHELL\|USER\|HOME\|LANG"
+VARS_EXPORTED="SHELL\|^USER=\|HOME\|LANG"
 
 post_install() {
   sudo ln -v -s -f $EMACS_DAEMON_PATH $EMACS_DAEMON_USER_PATH
   echo ":: Installed daemon for $SUDO_USER."
 
   echo ":: Getting useful vars from $SUDO_USER."
-  sudo -u $SUDO_USER env | grep $VARS_EXPORTED | sudo tee $DEFAULT_CONF_PATH
+  sudo -u $SUDO_USER env | grep $VARS_EXPORTED | sed "s/^/export /" | sudo tee $DEFAULT_CONF_PATH
   echo ":: Wrote default conf on $DEFAULT_CONF_PATH"
 
   echo ":: Add init script on openrc."