diff --git a/.config/.aliasrc b/.config/.aliasrc
index 7bd8fc9..61a8e06 100644
--- a/.config/.aliasrc
+++ b/.config/.aliasrc
@@ -17,3 +17,7 @@ alias \
     f="$FILE" \
     g="git" \
     v="$EDITOR"
+
+# XDG fixes
+alias \
+    mbsync="mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc -a"
diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index 04c8def..22a7484 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -14,8 +14,8 @@ Subfolders Verbatim
 Flatten .
 
 Channel jordan@vimium.com
-Master :jordan@vimium.com-remote:
-Slave :jordan@vimium.com-local:
+Far :jordan@vimium.com-remote:
+Near :jordan@vimium.com-local:
 Create Both
 Expunge Both
 Patterns *