diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 2e750c030c..24be841110 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -233,14 +233,13 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder):
             self.warn("cannot create templatebuiltins.js due to missing simplejson dependency")
             return
         self.info(bold("writing templatebuiltins.js..."))
-        try:
-            xrefs = self.env.reftargets.keys()
-            templatebuiltins = dict([('ttags', [n for (t,n) in xrefs if t == 'ttag']),
-                                     ('tfilters', [n for (t,n) in xrefs if t == 'tfilter'])])
-        except AttributeError:
-            xrefs = self.env.domaindata["std"]["objects"]
-            templatebuiltins = dict([('ttags', [n for (t,n) in xrefs if t == 'templatetag']),
-                                     ('tfilters', [n for (t,n) in xrefs if t == 'templatefilter'])])
+        xrefs = self.env.domaindata["std"]["objects"]
+        templatebuiltins = dict([('ttags', [n for ((t,n), (l,a)) in xrefs.items()
+                                            if t == 'templatetag' and
+                                            l == 'ref/templates/builtins' ]),
+                                 ('tfilters', [n for ((t,n), (l,a)) in xrefs.items()
+                                               if t == 'templatefilter' and
+                                               t == 'ref/templates/builtins'])])
         outfilename = os.path.join(self.outdir, "templatebuiltins.js")
         f = open(outfilename, 'wb')
         f.write('var django_template_builtins = ')