diff --git a/helpers/config b/helpers/config
index 03c055370333f160bf6ef5ec2bf8e7917a38d35f..0fe9cd716c1849a306ecd5a4772a38907b8d3f01 100755
--- a/helpers/config
+++ b/helpers/config
@@ -27,7 +27,7 @@ PACKAGE=$(echo $0 |/bin/sed s/make-//g)
 
 export DATE=$(date +'%a, %d %b %Y %T %z')
 
-export DATA=$PWD/DATA/$PACKAGE
+export DATA="$PWD/DATA/$PACKAGE"
 if ! [ 1$COMPONENT = "1main" ]
 then
     COMPONENT=${COMPONENT:-universe}
@@ -50,9 +50,9 @@ DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME
 LOCALMIRROR=http://archive.trisquel.info/trisquel
 LOCAL_APT=`mktemp -d` 
 
-export RPL=$PWD/DATA/rpl
+export RPL="$PWD/DATA/rpl"
 rpl(){
-$RPL $@
+$RPL "$@"
 }
 
 pkgversion(){