diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index 3d2c2332b8..30470fa66d 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -50,11 +50,21 @@ var BackendIDOperations = null;
 /**
  * @param {?object} props
  */
-function assertValidProps(props) {
+function assertValidProps(component, props) {
   if (!props) {
     return;
   }
   // Note the use of `==` which checks for null or undefined.
+  if (__DEV__) {
+    if (voidElementTags[component._tag]) {
+      warning(
+        props.children == null && props.dangerouslySetInnerHTML == null,
+        '%s is a void element tag and must not have `children` or ' +
+        'use `props.dangerouslySetInnerHTML`.',
+        component._tag
+      );
+    }
+  }
   if (props.dangerouslySetInnerHTML != null) {
     invariant(
       props.children == null,
@@ -134,6 +144,13 @@ var omittedCloseTags = {
   // NOTE: menuitem's close tag should be omitted, but that causes problems.
 };
 
+// For HTML, certain tags cannot have children. This has the same purpose as
+// `omittedCloseTags` except that `menuitem` should still have its closing tag.
+
+var voidElementTags = assign({
+  'menuitem': true
+}, omittedCloseTags);
+
 // We accept any tag to be rendered but since this gets injected into abitrary
 // HTML, we want to make sure that it's a safe tag.
 // http://www.w3.org/TR/REC-xml/#NT-Name
@@ -190,7 +207,7 @@ ReactDOMComponent.Mixin = {
    */
   mountComponent: function(rootID, transaction, context) {
     this._rootNodeID = rootID;
-    assertValidProps(this._currentElement.props);
+    assertValidProps(this, this._currentElement.props);
     var closeTag = omittedCloseTags[this._tag] ? '' : '</' + this._tag + '>';
     return (
       this._createOpenTagMarkupAndPutListeners(transaction) +
@@ -312,7 +329,7 @@ ReactDOMComponent.Mixin = {
    * @overridable
    */
   updateComponent: function(transaction, prevElement, nextElement, context) {
-    assertValidProps(this._currentElement.props);
+    assertValidProps(this, this._currentElement.props);
     this._updateDOMProperties(prevElement.props, transaction);
     this._updateDOMChildren(prevElement.props, transaction, context);
   },
diff --git a/src/browser/ui/__tests__/ReactDOMComponent-test.js b/src/browser/ui/__tests__/ReactDOMComponent-test.js
index 8b4a98eb07..fd986261dc 100644
--- a/src/browser/ui/__tests__/ReactDOMComponent-test.js
+++ b/src/browser/ui/__tests__/ReactDOMComponent-test.js
@@ -303,11 +303,13 @@ describe('ReactDOMComponent', function() {
   });
 
   describe('mountComponent', function() {
+    var React;
     var mountComponent;
 
     beforeEach(function() {
       require('mock-modules').dumpCache();
 
+      React = require('React');
       var ReactMultiChild = require('ReactMultiChild');
       var ReactDOMComponent = require('ReactDOMComponent');
       var ReactReconcileTransaction = require('ReactReconcileTransaction');
@@ -330,6 +332,46 @@ describe('ReactDOMComponent', function() {
       };
     });
 
+    it("should warn against children for void elements", function() {
+      spyOn(console, 'warn');
+
+      var container = document.createElement('div');
+
+      React.render(<input>children</input>, container);
+
+      expect(console.warn.argsForCall.length).toBe(1);
+      expect(console.warn.argsForCall[0][0]).toContain('void element');
+    });
+
+    it("should warn against dangerouslySetInnerHTML for void elements", function() {
+      spyOn(console, 'warn');
+
+      var container = document.createElement('div');
+
+      React.render(
+        <input dangerouslySetInnerHTML={{__html: 'content'}} />,
+        container
+      );
+
+      expect(console.warn.argsForCall.length).toBe(1);
+      expect(console.warn.argsForCall[0][0]).toContain('void element');
+    });
+
+    it("should treat menuitem as a void element but still create the closing tag", function() {
+      spyOn(console, 'warn');
+
+      var container = document.createElement('div');
+
+      React.render(<menuitem />, container);
+
+      expect(container.innerHTML).toContain('</menuitem>');
+
+      React.render(<menuitem>children</menuitem>, container);
+
+      expect(console.warn.argsForCall.length).toBe(1);
+      expect(console.warn.argsForCall[0][0]).toContain('void element');
+    });
+
     it("should validate against multiple children props", function() {
       expect(function() {
         mountComponent({children: '', dangerouslySetInnerHTML: ''});
@@ -396,6 +438,29 @@ describe('ReactDOMComponent', function() {
       container = document.createElement('div');
     });
 
+    it("should warn against children for void elements", function() {
+      spyOn(console, 'warn');
+
+      React.render(<input />, container);
+      React.render(<input>children</input>, container);
+
+      expect(console.warn.argsForCall.length).toBe(1);
+      expect(console.warn.argsForCall[0][0]).toContain('void element');
+    });
+
+    it("should warn against dangerouslySetInnerHTML for void elements", function() {
+      spyOn(console, 'warn');
+
+      React.render(<input />, container);
+      React.render(
+        <input dangerouslySetInnerHTML={{__html: 'content'}} />,
+        container
+      );
+
+      expect(console.warn.argsForCall.length).toBe(1);
+      expect(console.warn.argsForCall[0][0]).toContain('void element');
+    });
+
     it("should validate against multiple children props", function() {
       React.render(<div></div>, container);