diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 60e0475b43..5f021bff81 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -84,5 +84,6 @@ require_once("vpn.inc");
 require_once("vslb.inc");
 require_once("cmd_chain.inc");
 require_once("rrd.inc");
+require_once("haproxy.inc");
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index cb55117b2a..8125256898 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -47,7 +47,8 @@ function listtags() {
 		"option ppp package passthrumac phase1 phase2 priv proxyarpnet qinqentry queue ".
 		"pages pipe roll route row rrddatafile rule schedule service servernat servers ".
 		"serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ".
-		"tunnel user vip virtual_server vlan winsserver wolentry widget  "
+		"tunnel user vip virtual_server vlan winsserver wolentry widget  " .
+		"ha_frontend ha_backend ha_acl ha_server "
 		);
 	return $ret;
 }
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/gitsync
similarity index 100%
rename from etc/phpshellsessions/cvssync
rename to etc/phpshellsessions/gitsync
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 7784ec264b..3d58deb683 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -197,9 +197,12 @@ echo "done.\n";
 /* start load balancer daemon */
 relayd_configure();
 
-	/* reconfigure our gateway monitor */
+/* start haproxy daemon */ 
+haproxy_configure();
+
+/* reconfigure our gateway monitor */
 echo "Setting up gateway monitors...";
-	setup_gateways_monitor();
+setup_gateways_monitor();
 echo "done.\n";
 
 /* start OpenVPN server & clients */
@@ -346,4 +349,4 @@ mwexec_bg("/usr/sbin/update_dns_cache.sh");
 unlink("{$g['varrun_path']}/booting");
 $g['booting'] = FALSE;
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index cd4439dd65..63c741cb49 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -183,6 +183,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 								output_menu_item("/services_dhcp.php", "DHCP Server");
 							output_menu_item("/services_dyndns.php", "Dynamic DNS");
 							output_menu_item("/services_igmpproxy.php", "IGMP proxy");
+							output_menu_item("/haproxy_global.php", "HAProxy");
 							output_menu_item("/load_balancer_pool.php", "Load Balancer");
 							output_menu_item("/pkg_edit.php?xml=olsrd.xml&id=0", "OLSR");
 							output_menu_item("/vpn_pppoe.php", "PPPoE Server");
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index f80c375807..7ef37c1112 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -94,6 +94,7 @@ $d_vipconfdirty_path = $g['varrun_path'] . "/vip.conf.dirty";
 $d_sysctldirty_path = $g['varrun_path'] . "/sysctl.conf.dirty";
 $d_vsconfdirty_path = $g['varrun_path'] . "/vs.conf.dirty";
 $d_shaperconfdirty_path = $g['varrun_path'] . "/shaper.conf.dirty";
+$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
 
 /* OpenVPN Directories */
 $d_ovpnsrvdirty_path = "/tmp/ovpn-srv.dirty";