diff --git a/README.md b/README.md
index d09c412d..5bcef662 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,10 @@ Full documentation is at ReadTheDocs:
 * [TinyCoreLinux](http://distro.ibiblio.org/tinycorelinux/)
 * [Ubuntu](http://www.ubuntu.com/)
 
+#### Hypervisors
+
+* [Citrix XenServer](http://xenserver.org)
+
 #### Utilities
 
 * [AVG Rescue CD](http://www.avg.com/us-en/avg-rescue-cd)
diff --git a/docs/index.md b/docs/index.md
index f6325320..677d495e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -56,6 +56,10 @@ You'll need to make sure to have [DOWNLOAD_PROTO_HTTPS](https://github.com/ipxe/
 * [TinyCoreLinux](http://distro.ibiblio.org/tinycorelinux/)
 * [Ubuntu](http://www.ubuntu.com/)
 
+#### Hypervisors
+
+* [Citrix XenServer](http://xenserver.org)
+
 #### Utilities
 
 * [AVG Rescue CD](http://www.avg.com/us-en/avg-rescue-cd)
diff --git a/src/hypervisor.ipxe b/src/hypervisor.ipxe
new file mode 100644
index 00000000..97af9868
--- /dev/null
+++ b/src/hypervisor.ipxe
@@ -0,0 +1,28 @@
+#!ipxe
+
+goto ${menu} ||
+
+:hypervisor_menu
+menu Hypervisor Installers - [ ${arch} ]
+item --gap Citrix XenServer
+item xenserver ${space} Citrix XenServer
+choose menu || goto hypervisor_exit
+echo ${cls}
+goto ${menu} ||
+iseq ${sigs_enabled} true && goto verify_sigs || goto change_menu
+
+:verify_sigs
+imgverify ${menu}.ipxe ${sigs}${menu}.ipxe.sig || goto error
+goto change_menu
+
+:change_menu
+chain ${menu}.ipxe || goto error
+goto hypervisor_exit
+
+:hypervisor_exit
+clear menu
+exit 0
+
+:xenserver
+chain xenserver.ipxe
+goto hypervisor_menu
diff --git a/src/menu.ipxe b/src/menu.ipxe
index db71b0a2..e3c22b8c 100644
--- a/src/menu.ipxe
+++ b/src/menu.ipxe
@@ -30,6 +30,7 @@ item --gap Installers:
 item linux ${space} Linux Installers
 item bsd ${space} BSD Installers
 item freedos ${space} FreeDOS Installers
+item hypervisor ${space} Hypervisor Installers
 isset ${github_user} && item --gap Custom Menu: ||
 isset ${github_user} && item nbxyz-custom ${space} ${github_user}'s Custom Menu ||
 item --gap Tools:
diff --git a/src/xenserver.ipxe b/src/xenserver.ipxe
new file mode 100644
index 00000000..0f4bc040
--- /dev/null
+++ b/src/xenserver.ipxe
@@ -0,0 +1,43 @@
+#!ipxe
+
+# Citrix XenServer Hypervisor
+# http://xenserver.org
+
+goto ${menu} ||
+
+:xenserver
+clear osversion
+set os Citrix XenServer
+menu ${os} 
+item --gap Stable Releases
+item 6.5.0 ${space} ${os} 6.5 (creedence)
+#item --gap Test Releases
+#item dundee/beta2 ${space} ${os} Beta 2 (dundee)
+#item dundee/beta1 ${space} ${os} Beta 1 (dundee)
+choose xs_version || goto hypervisor_menu
+goto determine_type
+
+:determine_type
+set xs_mirror downloadns.citrix.com.edgesuite.net/11419/pxe
+set xs_type release/${xs_version}
+iseq ${xs_version} dundee/beta2 && set xs_type prerelease/${xs_version} ||
+iseq ${xs_version} dundee/beta1 && set xs_type prerelease/${xs_version} ||
+goto boot_xs
+
+:boot_xs
+imgfree
+echo When prompted for the repo to install from, 
+echo choose http and use the following repo:
+echo
+echo http://${xs_mirror}/${xs_type}
+echo
+kernel http://${xs_mirror}/${xs_type}/boot/xen dom0_max_vcpus=1-2 dom0_mem=752M,max:752M com1=115200,8n1 console=com1,vga
+module http://${xs_mirror}/${xs_type}/boot/vmlinuz xencons=hvc console=hvc0 console=tty0 install 
+module http://${xs_mirror}/${xs_type}/install.img
+prompt Please notate http repo above and press any key to continue...
+boot
+goto hypervisor_menu
+
+:hypervisor_menu
+clear menu
+exit 0