diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d5ad780
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Jiajun Liu <jiajun@unitedstack.com> <iamljj@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 718a760..6b6a85f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@
 Osamu Habuka <xiu.yushen@gmail.com>
 Russell Bryant <rbryant@redhat.com>
 Scott Moser <smoser@ubuntu.com>
+Sean Dague <sdague@linux.vnet.ibm.com>
 Sumit Naiksatam <sumitnaiksatam@gmail.com>
 Thierry Carrez <thierry@openstack.org>
 Todd Willey <xtoddx@gmail.com>
diff --git a/stackrc b/stackrc
index 871c8a1..edf5a82 100644
--- a/stackrc
+++ b/stackrc
@@ -164,14 +164,25 @@
 
 # Nova hypervisor configuration.  We default to libvirt with **kvm** but will
 # drop back to **qemu** if we are unable to load the kvm module.  ``stack.sh`` can
-# also install an **LXC** or **OpenVZ** based system.
+# also install an **LXC**, **OpenVZ** or **XenAPI** based system.
 VIRT_DRIVER=${VIRT_DRIVER:-libvirt}
-LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
-if [[ "$os_VENDOR" =~ (Debian) ]]; then
-  LIBVIRT_GROUP=libvirt
-else
-  LIBVIRT_GROUP=libvirtd
-fi
+case "$VIRT_DRIVER" in
+    libvirt)
+        LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
+        if [[ "$os_VENDOR" =~ (Debian) ]]; then
+            LIBVIRT_GROUP=libvirt
+        else
+            LIBVIRT_GROUP=libvirtd
+        fi
+        ;;
+    xenserver)
+        # Xen config common to nova and quantum
+        XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
+        XENAPI_USER=${XENAPI_USER:-"root"}
+        ;;
+    *)
+        ;;
+esac
 
 # Specify a comma-separated list of UEC images to download and install into glance.
 # supported urls here are:
@@ -234,10 +245,6 @@
 # Compatibility until it's eradicated from CI
 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
 
-# Xen config common to nova and quantum
-XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
-XENAPI_USER=${XENAPI_USER:-"root"}
-
 # Local variables:
 # mode: shell-script
 # End: