diff --git a/chrome/content/firegestures/browser.js b/chrome/content/firegestures/browser.js
index 0a28eb1..8f351d6 100644
--- a/chrome/content/firegestures/browser.js
+++ b/chrome/content/firegestures/browser.js
@@ -155,6 +155,8 @@ var FireGestures = {
 		switch (aGesture) {
 			case "wheel-up": 
 			case "wheel-down": 
+			case "wheel-left": 
+			case "wheel-right": 
 			case "rocker-left": 
 			case "rocker-right": 
 			case "keypress-ctrl": 
diff --git a/chrome/content/firegestures/prefs-generic.xul b/chrome/content/firegestures/prefs-generic.xul
index 349a855..0490d0e 100644
--- a/chrome/content/firegestures/prefs-generic.xul
+++ b/chrome/content/firegestures/prefs-generic.xul
@@ -48,6 +48,7 @@
 		<preferences>
 			<preference id="pref:triggerbutton" name="extensions.firegestures.trigger_button" type="int" />
 			<preference id="pref:wheelgesture"  name="extensions.firegestures.wheelgesture"   type="bool" />
+			<preference id="pref:hwheelgesture" name="extensions.firegestures.hwheelgesture"  type="bool" />
 			<preference id="pref:rockergesture" name="extensions.firegestures.rockergesture"  type="bool" />
 		</preferences>
 		<groupbox uigroup="wheelgesture">
@@ -86,6 +87,33 @@
 				</rows>
 			</grid>
 		</groupbox>
+		<groupbox uigroup="hwheelgesture">
+			<!-- dummy -->
+			<checkbox id="hwheelgesture" hidden="true"
+			          preference="pref:hwheelgesture"
+			          onsyncfrompreference="PrefsUI.updateUIGroup('hwheelgesture');" />
+			<caption label="&hwheelgesture;" />
+			<grid>
+				<columns>
+					<column />
+					<column />
+				</columns>
+				<rows>
+					<row align="center">
+						<label value="&hwheelgesture.left;:" />
+						<menulist id="wheelgestureL" sizetopopup="none" oncommand="gShouldCommit = true;">
+							<menupopup />
+						</menulist>
+					</row>
+					<row align="center">
+						<label value="&hwheelgesture.right;:" />
+						<menulist id="wheelgestureR" sizetopopup="none" oncommand="gShouldCommit = true;">
+							<menupopup />
+						</menulist>
+					</row>
+				</rows>
+			</grid>
+		</groupbox>
 		<groupbox uigroup="rockergesture">
 			<!-- dummy -->
 			<checkbox id="rockergesture" hidden="true"
diff --git a/chrome/content/firegestures/prefs.js b/chrome/content/firegestures/prefs.js
index b519bb9..96eb7c4 100644
--- a/chrome/content/firegestures/prefs.js
+++ b/chrome/content/firegestures/prefs.js
@@ -18,6 +18,8 @@ const kFlagsCol     = 4;
 const kExtraArray1 = [
 	["wheelGestureU",  "wheel-up"    ],
 	["wheelGestureD",  "wheel-down"  ],
+	["wheelGestureL",  "wheel-left"  ],
+	["wheelGestureR",  "wheel-right" ],
 	["rockerGestureL", "rocker-left" ],
 	["rockerGestureR", "rocker-right"],
 	["swipeGestureL",  "swipe-left"  ],
diff --git a/chrome/content/firegestures/prefs.xul b/chrome/content/firegestures/prefs.xul
index 074539e..9be60c3 100644
--- a/chrome/content/firegestures/prefs.xul
+++ b/chrome/content/firegestures/prefs.xul
@@ -157,6 +157,7 @@
 	<prefpane id="advancedPane" label="&advancedPane;" flex="1">
 		<preferences>
 			<preference id="pref:wheelgesture"    name="extensions.firegestures.wheelgesture"    type="bool" />
+			<preference id="pref:hwheelGesture"   name="extensions.firegestures.hwheelGesture"   type="bool" />
 			<preference id="pref:rockergesture"   name="extensions.firegestures.rockergesture"   type="bool" />
 			<preference id="pref:keypressgesture" name="extensions.firegestures.keypressgesture" type="bool" />
 			<preference id="pref:tabwheelgesture" name="extensions.firegestures.tabwheelgesture" type="bool" />
@@ -194,6 +195,33 @@
 				</rows>
 			</grid>
 		</groupbox>
+		<groupbox uigroup="hwheelGesture">
+			<caption>
+				<checkbox id="hwheelGesture" label="&hwheelGesture;"
+				          preference="pref:hwheelGesture"
+				          onsyncfrompreference="PrefsUI.updateUIGroup('hwheelGesture');" />
+			</caption>
+			<grid>
+				<columns>
+					<column />
+					<column />
+				</columns>
+				<rows>
+					<row align="center">
+						<label value="&hwheelGesture.left;:" />
+						<menulist id="wheelGestureL" sizetopopup="none" oncommand="gShouldCommit = true;">
+							<menupopup />
+						</menulist>
+					</row>
+					<row align="center">
+						<label value="&hwheelGesture.right;:" />
+						<menulist id="wheelGestureR" sizetopopup="none" oncommand="gShouldCommit = true;">
+							<menupopup />
+						</menulist>
+					</row>
+				</rows>
+			</grid>
+		</groupbox>
 		<groupbox uigroup="rockergesture">
 			<caption>
 				<checkbox id="rockergesture" label="&rockerGesture;"
diff --git a/chrome/locale/en-US/firegestures/prefs.dtd b/chrome/locale/en-US/firegestures/prefs.dtd
index fbce76d..b99ad1c 100644
--- a/chrome/locale/en-US/firegestures/prefs.dtd
+++ b/chrome/locale/en-US/firegestures/prefs.dtd
@@ -32,6 +32,9 @@
 <!ENTITY wheelGesture.down.left "Scroll down with holding left-button">
 <!ENTITY wheelGesture.down.middle "Scroll down with holding middle-button">
 <!ENTITY wheelGesture.down.right "Scroll down with holding right-button">
+<!ENTITY hwheelGesture "Horizontal Wheel Gestures">
+<!ENTITY hwheelGesture.left "Scroll Left">
+<!ENTITY hwheelGesture.right "Scroll Right">
 <!ENTITY rockerGesture "Rocker Gestures">
 <!ENTITY rockerGesture.left "Left-click with holding right-button">
 <!ENTITY rockerGesture.right "Right-click with holding left-button">
diff --git a/components/xdGestureHandler.js b/components/xdGestureHandler.js
index 2ef107d..788ad00 100644
--- a/components/xdGestureHandler.js
+++ b/components/xdGestureHandler.js
@@ -144,13 +144,14 @@ xdGestureHandler.prototype = {
 		this._swipeTimeout   = getPref("swipe_timeout");
 		this._mouseGestureEnabled    = getPref("mousegesture");
 		this._wheelGestureEnabled    = getPref("wheelgesture");
+		this._hwheelGestureEnabled   = getPref("hwheelgesture");
 		this._rockerGestureEnabled   = getPref("rockergesture");
 		this._keypressGestureEnabled = getPref("keypressgesture");
 		this._swipeGestureEnabled    = getPref("swipegesture");
 		// prefs for wheel gestures and rocker gestures
 		this._drawArea.removeEventListener("DOMMouseScroll", this, true);
 		this._drawArea.removeEventListener("click", this, true);
-		if (this._wheelGestureEnabled)
+		if (this._wheelGestureEnabled || this._hwheelGestureEnabled)
 			this._drawArea.addEventListener("DOMMouseScroll", this, true);
 		if (this._rockerGestureEnabled)
 			this._drawArea.addEventListener("click", this, true);
@@ -355,6 +356,15 @@ xdGestureHandler.prototype = {
 					// required to suppress page scroll if using SmoothWheel or Yet Another Smooth Scrolling
 					event.stopPropagation();
 				}
+				if (event.axis == 1) {
+					this._state = STATE_WHEEL;
+					this._invokeExtraGesture(event, event.detail < 0 ? "wheel-left" : "wheel-right");
+					// suppress page scroll
+					event.preventDefault();
+					// required to suppress page scroll if using SmoothWheel or Yet Another Smooth Scrolling
+					event.stopPropagation();
+					this._state = STATE_READY;
+				}
 				break;
 			case "click": 
 				// this fixes the bug: performing rocker-left on a link causes visiting the link
diff --git a/defaults/preferences/firegestures-prefs.js b/defaults/preferences/firegestures-prefs.js
index 5229c11..93735f9 100644
--- a/defaults/preferences/firegestures-prefs.js
+++ b/defaults/preferences/firegestures-prefs.js
@@ -1,5 +1,6 @@
 pref("extensions.firegestures.mousegesture", true);
 pref("extensions.firegestures.wheelgesture", true);
+pref("extensions.firegestures.hwheelgesture", false);
 pref("extensions.firegestures.rockergesture", false);
 pref("extensions.firegestures.keypressgesture", true);
 pref("extensions.firegestures.tabwheelgesture", false);