diff --git a/sphinx/builder.py b/sphinx/builder.py
index 8ec87f84a..d4f6b278a 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -485,7 +485,9 @@ class StandaloneHTMLBuilder(Builder):
                                                       filename[:-4] + '.html'))
             except:
                 targetmtime = 0
-            if path.getmtime(path.join(self.srcdir, filename)) > targetmtime:
+            if filename not in self.env.all_files:
+                yield filename
+            elif path.getmtime(path.join(self.srcdir, filename)) > targetmtime:
                 yield filename
 
 
diff --git a/sphinx/roles.py b/sphinx/roles.py
index 6aefee04c..e7dda55a7 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -20,7 +20,7 @@ ws_re = re.compile(r'\s+')
 
 generic_docroles = {
     'command' : nodes.strong,
-    'dfn' : addnodes.emphasis,
+    'dfn' : nodes.emphasis,
     'guilabel' : nodes.strong,
     'kbd' : nodes.literal,
     'keyword' : nodes.literal,