diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 8602cab229..c958e38863 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -51,6 +51,9 @@ EMAIL_HOST = 'localhost'
 # List of locations of the template source files, in search order.
 TEMPLATE_DIRS = ()
 
+# Extension on all templates.
+TEMPLATE_FILE_EXTENSION = '.html'
+
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
diff --git a/django/core/template_file.py b/django/core/template_file.py
index 25862da55a..d8403dc8a9 100644
--- a/django/core/template_file.py
+++ b/django/core/template_file.py
@@ -1,10 +1,8 @@
 "Wrapper for loading templates from files"
-from django.conf.settings import TEMPLATE_DIRS
+from django.conf.settings import TEMPLATE_DIRS, TEMPLATE_FILE_EXTENSION
 from template import TemplateDoesNotExist
 import os
 
-TEMPLATE_FILE_EXTENSION = '.html'
-
 def load_template_source(template_name, template_dirs=None):
     if not template_dirs:
         template_dirs = TEMPLATE_DIRS