diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index cbfa1769cf4ba8fb3a4f89b11307b41cd4bd55eb..cddcb3846bb59ec9038366895abc90a7644e487e 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -21,6 +21,7 @@ C_SRCS = \
 	htmlelem2.c \
 	htmlinput.c \
 	htmlnode.c \
+	htmloption.c \
 	htmlselect.c \
 	htmlstyle.c \
 	htmlstylesheet.c \
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 4d921c229dbc6d24c79eb527e5f368be67d44473..5fdd85e69ab87b3100f5d2d39787b309f8acdbc8 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -1291,6 +1291,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode)
     static const WCHAR wszA[]        = {'A',0};
     static const WCHAR wszBODY[]     = {'B','O','D','Y',0};
     static const WCHAR wszINPUT[]    = {'I','N','P','U','T',0};
+    static const WCHAR wszOPTION[]   = {'O','P','T','I','O','N',0};
     static const WCHAR wszSELECT[]   = {'S','E','L','E','C','T',0};
     static const WCHAR wszTEXTAREA[] = {'T','E','X','T','A','R','E','A',0};
 
@@ -1309,6 +1310,8 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode)
         ret = HTMLBodyElement_Create(nselem);
     else if(!strcmpW(class_name, wszINPUT))
         ret = HTMLInputElement_Create(nselem);
+    else if(!strcmpW(class_name, wszOPTION))
+        ret = HTMLOptionElement_Create(nselem);
     else if(!strcmpW(class_name, wszSELECT))
         ret = HTMLSelectElement_Create(nselem);
     else if(!strcmpW(class_name, wszTEXTAREA))
diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e707ad6a92ee858ae068b32e26db74ea55f32e2
--- /dev/null
+++ b/dlls/mshtml/htmloption.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2007 Jacek Caban for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "ole2.h"
+
+#include "wine/debug.h"
+
+#include "mshtml_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+
+typedef struct {
+    HTMLElement element;
+
+    const IHTMLOptionElementVtbl *lpHTMLOptionElementVtbl;
+} HTMLOptionElement;
+
+#define HTMLOPTION(x)  ((IHTMLOptionElement*)  &(x)->lpHTMLOptionElementVtbl)
+
+#define HTMLOPTION_THIS(iface) DEFINE_THIS(HTMLOptionElement, HTMLOptionElement, iface)
+
+static HRESULT WINAPI HTMLOptionElement_QueryInterface(IHTMLOptionElement *iface,
+        REFIID riid, void **ppv)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+
+    return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv);
+}
+
+static ULONG WINAPI HTMLOptionElement_AddRef(IHTMLOptionElement *iface)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+
+    return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node));
+}
+
+static ULONG WINAPI HTMLOptionElement_Release(IHTMLOptionElement *iface)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+
+    return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node));
+}
+
+static HRESULT WINAPI HTMLOptionElement_GetTypeInfoCount(IHTMLOptionElement *iface, UINT *pctinfo)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, pctinfo);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_GetTypeInfo(IHTMLOptionElement *iface, UINT iTInfo,
+                                              LCID lcid, ITypeInfo **ppTInfo)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_GetIDsOfNames(IHTMLOptionElement *iface, REFIID riid,
+                                                LPOLESTR *rgszNames, UINT cNames,
+                                                LCID lcid, DISPID *rgDispId)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+                                        lcid, rgDispId);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_Invoke(IHTMLOptionElement *iface, DISPID dispIdMember,
+                            REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
+                            VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+            lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_put_selected(IHTMLOptionElement *iface, VARIANT_BOOL v)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%x)\n", This, v);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_selected(IHTMLOptionElement *iface, VARIANT_BOOL *p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_put_value(IHTMLOptionElement *iface, BSTR v)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%s)\n", This, debugstr_w(v));
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_value(IHTMLOptionElement *iface, BSTR *p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_put_defaultSelected(IHTMLOptionElement *iface, VARIANT_BOOL v)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%x)\n", This, v);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_defaultSelected(IHTMLOptionElement *iface, VARIANT_BOOL *p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_put_index(IHTMLOptionElement *iface, LONG v)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%d)\n", This, v);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_index(IHTMLOptionElement *iface, LONG *p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR v)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%s)\n", This, debugstr_w(v));
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_text(IHTMLOptionElement *iface, BSTR *p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI HTMLOptionElement_get_form(IHTMLOptionElement *iface, IHTMLFormElement **p)
+{
+    HTMLOptionElement *This = HTMLOPTION_THIS(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+#undef HTMLOPTION_THIS
+
+static const IHTMLOptionElementVtbl HTMLOptionElementVtbl = {
+    HTMLOptionElement_QueryInterface,
+    HTMLOptionElement_AddRef,
+    HTMLOptionElement_Release,
+    HTMLOptionElement_GetTypeInfoCount,
+    HTMLOptionElement_GetTypeInfo,
+    HTMLOptionElement_GetIDsOfNames,
+    HTMLOptionElement_Invoke,
+    HTMLOptionElement_put_selected,
+    HTMLOptionElement_get_selected,
+    HTMLOptionElement_put_value,
+    HTMLOptionElement_get_value,
+    HTMLOptionElement_put_defaultSelected,
+    HTMLOptionElement_get_defaultSelected,
+    HTMLOptionElement_put_index,
+    HTMLOptionElement_get_index,
+    HTMLOptionElement_put_text,
+    HTMLOptionElement_get_text,
+    HTMLOptionElement_get_form
+};
+
+#define HTMLOPTION_NODE_THIS(iface) DEFINE_THIS2(HTMLOptionElement, element.node, iface)
+
+static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
+{
+    HTMLOptionElement *This = HTMLOPTION_NODE_THIS(iface);
+
+    *ppv = NULL;
+
+    if(IsEqualGUID(&IID_IUnknown, riid)) {
+        TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
+        *ppv = HTMLOPTION(This);
+    }else if(IsEqualGUID(&IID_IDispatch, riid)) {
+        TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv);
+        *ppv = HTMLOPTION(This);
+    }else if(IsEqualGUID(&IID_IHTMLOptionElement, riid)) {
+        TRACE("(%p)->(IID_IHTMLOptionElement %p)\n", This, ppv);
+        *ppv = HTMLOPTION(This);
+    }
+
+    if(*ppv) {
+        IUnknown_AddRef((IUnknown*)*ppv);
+        return S_OK;
+    }
+
+    return HTMLElement_QI(&This->element.node, riid, ppv);
+}
+
+static void HTMLOptionElement_destructor(HTMLDOMNode *iface)
+{
+    HTMLOptionElement *This = HTMLOPTION_NODE_THIS(iface);
+    HTMLElement_destructor(&This->element.node);
+}
+
+#undef HTMLOPTION_NODE_THIS
+
+static const NodeImplVtbl HTMLOptionElementImplVtbl = {
+    HTMLOptionElement_QI,
+    HTMLOptionElement_destructor
+};
+
+HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem)
+{
+    HTMLOptionElement *ret = mshtml_alloc(sizeof(HTMLOptionElement));
+
+    ret->lpHTMLOptionElementVtbl = &HTMLOptionElementVtbl;
+    ret->element.node.vtbl = &HTMLOptionElementImplVtbl;
+
+    return &ret->element;
+}
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index f73d1a0ebef89d8cffe3b2bcd29da98985f4c143..68e7e149e2d808522537a7d820c414b97c71127e 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -415,6 +415,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode*);
 HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*);
 HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*);
 HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement*);
+HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement*);
 HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*);
 HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*);