diff --git a/qrexec/qubes_rpc_multiplexer b/qrexec/qubes_rpc_multiplexer
index 8f03137a..89cdbed7 100755
--- a/qrexec/qubes_rpc_multiplexer
+++ b/qrexec/qubes_rpc_multiplexer
@@ -5,8 +5,9 @@ if ! [ $# = 2 ] ; then
 	exit 1
 fi
 CFG_FILE=$QUBES_RPC/"$1"
+export QREXEC_REMOTE_DOMAIN="$2"
 if [ -s "$CFG_FILE" ] ; then
-	exec $(cat "$CFG_FILE") "$2"
+	exec $(cat "$CFG_FILE")
 	echo "$0: failed to execute handler for" "$1" >&2
 	exit 1
 fi
diff --git a/qubes_rpc/qfile-unpacker.c b/qubes_rpc/qfile-unpacker.c
index eaa5c067..dd0a510d 100644
--- a/qubes_rpc/qfile-unpacker.c
+++ b/qubes_rpc/qfile-unpacker.c
@@ -51,13 +51,19 @@ int main(int argc, char ** argv)
 	char *incoming_dir;
 	int pipefds[2];
 	int uid;
+	char *remote_domain;
 
 	pipe(pipefds);
 
 	uid = prepare_creds_return_uid("user");
 
+	remote_domain = getenv("QREXEC_REMOTE_DOMAIN");
+	if (!remote_domain) {
+		gui_fatal("Cannot get remote domain name");
+		exit(1);
+	}
 	mkdir(INCOMING_DIR_ROOT, 0700);
-	asprintf(&incoming_dir, "%s/from-%s", INCOMING_DIR_ROOT, argv[1]);
+	asprintf(&incoming_dir, "%s/from-%s", INCOMING_DIR_ROOT, remote_domain);
 	mkdir(incoming_dir, 0700);
 	if (chdir(incoming_dir))
 		gui_fatal("Error chdir to %s", incoming_dir);