diff --git a/CHANGES b/CHANGES
index ebeb32476..613321268 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Bugs fixed
 
 * Fix line numbers was not shown on warnings in LaTeX and texinfo builders
 * Fix filenames were not shown on warnings of citations
+* Fix line numbers was not shown on warnings in LaTeX and texinfo builders
 
 Release 1.3.4 (released Jan 12, 2016)
 =====================================
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 6e132e539..1ba67c380 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -628,7 +628,8 @@ class StandardDomain(Domain):
                 return None
 
             if env.config.numfig is False:
-                env.warn(fromdocname, 'numfig is disabled. :numref: is ignored.')
+                env.warn(fromdocname, 'numfig is disabled. :numref: is ignored.',
+                         lineno=node.line)
                 return contnode
 
             try:
@@ -646,7 +647,8 @@ class StandardDomain(Domain):
             try:
                 newtitle = title % '.'.join(map(str, fignumber))
             except TypeError:
-                env.warn(fromdocname, 'invalid numfig_format: %s' % title)
+                env.warn(fromdocname, 'invalid numfig_format: %s' % title,
+                         lineno=node.line)
                 return None
 
             return self.build_reference_node(fromdocname, builder,
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 538d8581d..ef84bbcb4 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -495,8 +495,10 @@ def test_tocdepth_singlehtml(app, status, warning):
 def test_numfig_disabled(app, status, warning):
     app.builder.build_all()
 
-    assert 'WARNING: invalid numfig_format: invalid' not in warning.getvalue()
-    assert 'WARNING: invalid numfig_format: Fig %s %s' not in warning.getvalue()
+    assert ('index.rst:45: WARNING: numfig is disabled. :numref: is ignored.'
+            in warning.getvalue())
+    assert 'index.rst:51: WARNING: invalid numfig_format: invalid' not in warning.getvalue()
+    assert 'index.rst:52: WARNING: invalid numfig_format: Fig %s %s' not in warning.getvalue()
 
     expects = {
         'index.html': [
@@ -554,8 +556,10 @@ def test_numfig_without_numbered_toctree(app, status, warning):
     (app.srcdir / 'index.rst').write_text(index, encoding='utf-8')
     app.builder.build_all()
 
-    assert 'WARNING: invalid numfig_format: invalid' in warning.getvalue()
-    assert 'WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
+    assert ('index.rst:45: WARNING: numfig is disabled. :numref: is ignored.'
+            not in warning.getvalue())
+    assert 'index.rst:51: WARNING: invalid numfig_format: invalid' in warning.getvalue()
+    assert 'index.rst:52: WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
 
     expects = {
         'index.html': [
@@ -649,8 +653,10 @@ def test_numfig_without_numbered_toctree(app, status, warning):
 def test_numfig_with_numbered_toctree(app, status, warning):
     app.builder.build_all()
 
-    assert 'WARNING: invalid numfig_format: invalid' in warning.getvalue()
-    assert 'WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
+    assert ('index.rst:45: WARNING: numfig is disabled. :numref: is ignored.'
+            not in warning.getvalue())
+    assert 'index.rst:51: WARNING: invalid numfig_format: invalid' in warning.getvalue()
+    assert 'index.rst:52: WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
 
     expects = {
         'index.html': [
@@ -747,8 +753,10 @@ def test_numfig_with_numbered_toctree(app, status, warning):
 def test_numfig_with_prefix(app, status, warning):
     app.builder.build_all()
 
-    assert 'WARNING: invalid numfig_format: invalid' in warning.getvalue()
-    assert 'WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
+    assert ('index.rst:45: WARNING: numfig is disabled. :numref: is ignored.'
+            not in warning.getvalue())
+    assert 'index.rst:51: WARNING: invalid numfig_format: invalid' in warning.getvalue()
+    assert 'index.rst:52: WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
 
     expects = {
         'index.html': [
@@ -842,8 +850,10 @@ def test_numfig_with_prefix(app, status, warning):
 def test_numfig_with_secnum_depth(app, status, warning):
     app.builder.build_all()
 
-    assert 'WARNING: invalid numfig_format: invalid' in warning.getvalue()
-    assert 'WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
+    assert ('index.rst:45: WARNING: numfig is disabled. :numref: is ignored.'
+            not in warning.getvalue())
+    assert 'index.rst:51: WARNING: invalid numfig_format: invalid' in warning.getvalue()
+    assert 'index.rst:52: WARNING: invalid numfig_format: Fig %s %s' in warning.getvalue()
 
     expects = {
         'index.html': [