diff --git a/CHANGES b/CHANGES
index de9557ddc..b1f2a3060 100644
--- a/CHANGES
+++ b/CHANGES
@@ -50,6 +50,7 @@ Bugs fixed
 * #1601, #2220: 'any' role breaks extended domains behavior. Affected extensions doesn't
   support resolve_any_xref and resolve_xref returns problematic node instead of None.
   sphinxcontrib-httpdomain is one of them.
+* #2229: Fix no warning is given for unknown options
 
 Release 1.3.3 (released Dec 2, 2015)
 ====================================
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index aa15279a0..ade081c70 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -675,6 +675,8 @@ class StandardDomain(Domain):
                     if docname:
                         break
                 else:
+                    env.warn(fromdocname, 'unknown option: %s' % (contnode.astext()),
+                             lineno=node.line)
                     return None
 
             return make_refnode(builder, fromdocname, docname,
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 9ab944451..d463cab87 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -38,6 +38,15 @@ with "\\?": b?'here: >>>(\\\\|/)xbb<<<'
 HTML_WARNINGS = ENV_WARNINGS + """\
 %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
 None:\\d+: WARNING: citation not found: missing
+%(root)s/markup.txt:158: WARNING: unknown option: &option
+%(root)s/markup.txt:395: WARNING: unknown option: headings
+%(root)s/markup.txt:395: WARNING: unknown option: objects
+%(root)s/markup.txt:395: WARNING: unknown option: modules
+%(root)s/markup.txt:395: WARNING: unknown option: classes
+%(root)s/markup.txt:400: WARNING: unknown option: JS
+%(root)s/markup.txt:401: WARNING: unknown option: C
+%(root)s/markup.txt:402: WARNING: unknown option: myobj
+%(root)s/markup.txt:403: WARNING: unknown option: n::Array
 %(root)s/markup.txt:: WARNING: invalid single index entry u''
 %(root)s/markup.txt:: WARNING: invalid pair index entry u''
 %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index d233c12b8..6049be6fb 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -24,6 +24,15 @@ from test_build_html import ENV_WARNINGS
 
 
 LATEX_WARNINGS = ENV_WARNINGS + """\
+%(root)s/markup.txt:: WARNING: unknown option: &option
+%(root)s/markup.txt:: WARNING: unknown option: headings
+%(root)s/markup.txt:: WARNING: unknown option: objects
+%(root)s/markup.txt:: WARNING: unknown option: modules
+%(root)s/markup.txt:: WARNING: unknown option: classes
+%(root)s/markup.txt:: WARNING: unknown option: JS
+%(root)s/markup.txt:: WARNING: unknown option: C
+%(root)s/markup.txt:: WARNING: unknown option: myobj
+%(root)s/markup.txt:: WARNING: unknown option: n::Array
 None:None: WARNING: citation not found: missing
 None:None: WARNING: no matching candidate for image URI u'foo.\\*'
 WARNING: invalid pair index entry u''