diff --git a/src/UnitJS/Dom.js b/src/UnitJS/Dom.js
index 9c8bee2..e443cc1 100644
--- a/src/UnitJS/Dom.js
+++ b/src/UnitJS/Dom.js
@@ -22,11 +22,13 @@ function make(tag, properties, children) {
 			case "maxlength":
 				e.setAttribute("maxlength", value);
 				break;
-			case "onClick":
-				e.addEventListener("click", value);
-				break;;
 			default:
-				e[key] = value;
+				var matched = key.match(/on([A-Z]\w+)/);
+				if(matched) {
+					e.addEventListener(matched[1].toLowerCase(), value);
+				} else {
+					e[key] = value;
+				}
 		}
 	}
 	for(var i = 0; i < children.length; i++) {