diff --git a/mozilla/layout/forms/resources/content/select.xml b/mozilla/layout/forms/resources/content/select.xml
index 5026f7ec7a7..3b849dd0ac6 100644
--- a/mozilla/layout/forms/resources/content/select.xml
+++ b/mozilla/layout/forms/resources/content/select.xml
@@ -513,5 +513,22 @@
 
    </binding>
  
-  <binding id="select"/>
+  <binding id="select" extends="xul:menu">
+    <content sizetopopup="true">
+        <xul:label flex="1" value="Dummy" style="border: 1px solid red"/>
+        <xul:dropmarker/>
+        <xul:menupopup style="display:-moz-popup!important">
+          <children/>
+        </xul:menupopup>
+    </content>
+  </binding>
+
+  <binding id="select-option" extends="xul:menuitem">
+    <content>
+       <xul:label>
+         <children/>
+      </xul:label>
+    </content>
+  </binding>
+
 </bindings>          
diff --git a/mozilla/layout/forms/resources/content/xbl-forms.css b/mozilla/layout/forms/resources/content/xbl-forms.css
index a8a87752228..b4d846fdc6f 100644
--- a/mozilla/layout/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/forms/resources/content/xbl-forms.css
@@ -46,6 +46,15 @@ select, select[size="1"] {
   -moz-binding: url("chrome://forms/content/select.xml#select");
 }
 
+select[size] > option {
+  -moz-binding: none;
+}
+
+select > option,
+select[size="1"] > option {
+  -moz-binding: url("chrome://forms/content/select.xml#select-option");
+}
+
 /*
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.
diff --git a/mozilla/layout/html/forms/resources/content/select.xml b/mozilla/layout/html/forms/resources/content/select.xml
index 5026f7ec7a7..3b849dd0ac6 100644
--- a/mozilla/layout/html/forms/resources/content/select.xml
+++ b/mozilla/layout/html/forms/resources/content/select.xml
@@ -513,5 +513,22 @@
 
    </binding>
  
-  <binding id="select"/>
+  <binding id="select" extends="xul:menu">
+    <content sizetopopup="true">
+        <xul:label flex="1" value="Dummy" style="border: 1px solid red"/>
+        <xul:dropmarker/>
+        <xul:menupopup style="display:-moz-popup!important">
+          <children/>
+        </xul:menupopup>
+    </content>
+  </binding>
+
+  <binding id="select-option" extends="xul:menuitem">
+    <content>
+       <xul:label>
+         <children/>
+      </xul:label>
+    </content>
+  </binding>
+
 </bindings>          
diff --git a/mozilla/layout/html/forms/resources/content/xbl-forms.css b/mozilla/layout/html/forms/resources/content/xbl-forms.css
index a8a87752228..b4d846fdc6f 100644
--- a/mozilla/layout/html/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/html/forms/resources/content/xbl-forms.css
@@ -46,6 +46,15 @@ select, select[size="1"] {
   -moz-binding: url("chrome://forms/content/select.xml#select");
 }
 
+select[size] > option {
+  -moz-binding: none;
+}
+
+select > option,
+select[size="1"] > option {
+  -moz-binding: url("chrome://forms/content/select.xml#select-option");
+}
+
 /*
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.