diff --git a/src/hiccup/form.clj b/src/hiccup/form.clj
index 7c60fae..c072252 100644
--- a/src/hiccup/form.clj
+++ b/src/hiccup/form.clj
@@ -74,6 +74,12 @@
              :value value
              :checked checked?}]))
 
+(defn- selected? [x selected]
+  (boolean (cond
+             (sequential? selected) ((set selected) x)
+             (ifn? selected) (selected x)
+             :else (= x selected))))
+
 (defelem select-options
   "Creates a seq of option tags from a collection."
   ([coll] (select-options coll nil))
@@ -83,8 +89,8 @@
         (let [[text val] x]
           (if (sequential? val)
             [:optgroup {:label text} (select-options val selected)]
-            [:option {:value val :selected (= val selected)} text]))
-        [:option {:selected (= x selected)} x]))))
+            [:option {:value val :selected (selected? val selected)} text]))
+        [:option {:selected (selected? x selected)} x]))))
 
 (defelem drop-down
   "Creates a drop-down box using the `<select>` tag."
diff --git a/test/hiccup/form_test.clj b/test/hiccup/form_test.clj
index def3a8f..45a66e5 100644
--- a/test/hiccup/form_test.clj
+++ b/test/hiccup/form_test.clj
@@ -71,9 +71,23 @@
            "<option value=\"2\">baz</option></optgroup>")
     (select-options [["Foo" [1 2]]] 2)
       (str "<optgroup label=\"Foo\"><option>1</option>"
-           "<option selected=\"selected\">2</option></optgroup>")))
-
-
+           "<option selected=\"selected\">2</option></optgroup>")
+    (select-options ["foo" "bar" "baz"] ["foo" "bar"])
+      (str "<option selected=\"selected\">foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option>baz</option>")
+    (select-options ["foo" "bar" "baz"] '("foo" "bar"))
+      (str "<option selected=\"selected\">foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option>baz</option>")
+    (select-options [["Foo" 1] ["Bar" 2] ["Baz" 3]] [1 3])
+      (str "<option selected=\"selected\" value=\"1\">Foo</option>"
+           "<option value=\"2\">Bar</option>"
+           "<option selected=\"selected\" value=\"3\">Baz</option>")
+    (select-options ["foo" "bar" "baz"] #(= \b (nth % 0)))
+      (str "<option>foo</option>"
+           "<option selected=\"selected\">bar</option>"
+           "<option selected=\"selected\">baz</option>")))
 
 (deftest test-drop-down
   (let [options ["op1" "op2"]