diff --git a/bin/xo-build.in b/bin/xo-build.in
index 444bf6d..0ce604b 100644
--- a/bin/xo-build.in
+++ b/bin/xo-build.in
@@ -278,7 +278,8 @@ fi
 if [[ $split_umbrella_remote_flag -eq 1 ]]; then
     if [[ -n "$xoname" ]]; then
         #branch=$(git branch --show-current)
-        cmd="git subtree split --rejoin --prefix=$xoname"
+        demux_branch=_demux/$xoname
+        cmd="git subtree split --rejoin --prefix=$xoname -b ${demux_branch}"
 
         if [[ $noop_flag -eq 1 ]]; then
             echo $cmd
@@ -304,12 +305,19 @@ fi
 if [[ $push_umbrella_remote_flag -eq 1 ]]; then
     if [[ -n "$xoname" ]]; then
         branch=$(git branch --show-current)
-        cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
+        demux_branch=_demux/$xoname
+        cmd1="git subtree split --rejoin --prefix=$xoname -b ${demux_branch}"
+        remote=${xoname}
+        remote_branch=${branch}
+        cmd2="git push ${remote} ${demux_branch}:${remote_branch}"
+        #cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
 
         if [[ $noop_flag -eq 1 ]]; then
-            echo $cmd
+            echo $cmd1
+            echo $cmd2
         else
-            $cmd
+            $cmd1
+            $cmd2
         fi
     fi
 fi