diff --git a/templates/repository/log.html b/templates/repository/log.html
index b74f5af..f6f5add 100644
--- a/templates/repository/log.html
+++ b/templates/repository/log.html
@@ -40,8 +40,10 @@
                     <td class="id">ID</td>
                     <td class="message">Message</td>
                     <td class="time">Commit time</td>
-                    <td class="files">Files</td>
-                    <td class="lines">Lines</td>
+                    {% if defaults.LOG_STATS %}
+                        <td class="files">Files</td>
+                        <td class="lines">Lines</td>
+                    {% endif %}
                 </tr>
             </thead>
             
@@ -72,16 +74,19 @@
                     <td class="time" title="{{ commit_time(commit.commit_time, commit.commit_time_offset) }}">
                         {{ commit_time(commit.commit_time, commit.commit_time_offset)|ago }}
                     </td>
-                    <td class="files">
-                        {% if commit.short_id in diff %}
-                            {{ diff[commit.short_id].stats.files_changed }}
-                        {% endif %}
-                    </td>
-                    <td class="lines">
-                        {% if commit.short_id in diff %}
-                            <span class="insertions">+{{ diff[commit.short_id].stats.insertions }}</span>/<span class="deletions">-{{ diff[commit.short_id].stats.deletions }}</span>
-                        {% endif %}
-                    </td>
+                    
+                    {% if defaults.LOG_STATS %}
+                        <td class="files">
+                            {% if commit.short_id in diff %}
+                                {{ diff[commit.short_id].stats.files_changed }}
+                            {% endif %}
+                        </td>
+                        <td class="lines">
+                            {% if commit.short_id in diff %}
+                                <span class="insertions">+{{ diff[commit.short_id].stats.insertions }}</span>/<span class="deletions">-{{ diff[commit.short_id].stats.deletions }}</span>
+                            {% endif %}
+                        </td>
+                    {% endif %}
                 </tr>
             {% endfor %}
             </tbody>
diff --git a/web.py b/web.py
index 4b5d942..487dbdf 100644
--- a/web.py
+++ b/web.py
@@ -44,6 +44,10 @@ INSTANCE_DOMAIN = 'domain.local'
 # How many commits to show in the log page
 LOG_PAGINATION = 100
 
+# Enable +/- file stats in the log page. Can be disabled for performance, since
+# computing diffstat on many commits for big repos could take too long.
+LOG_STATS = True
+
 # Default options for showing diffs in "commit" page
 DIFF_VIEW = 'udiff' # "udiff", "udiff_raw" "ssdiff"
 DIFF_CONTEXT_LINES = 3
@@ -182,7 +186,8 @@ template = functools.partial(template, template_settings = {
         'defaults': {
             'DIFF_EXPAND': DIFF_EXPAND,
             'DIFF_EXPAND_DIFFSTAT': DIFF_EXPAND_DIFFSTAT,
-            'DIFF_EXPAND_DIFFOPTIONS': DIFF_EXPAND_DIFFOPTIONS
+            'DIFF_EXPAND_DIFFOPTIONS': DIFF_EXPAND_DIFFOPTIONS,
+            'LOG_STATS': LOG_STATS
         }
     },
     'autoescape': True
@@ -513,10 +518,11 @@ def log(repository, revision):
         commits.append(commit)
         
         # Diff with parent tree, or empty tree if there's no parent
-        diff[commit.short_id] = \
-                 commit.parents[0].tree.diff_to_tree(commit.tree) \
-            if   len(commit.parents) > 0 \
-            else commit.tree.diff_to_tree(swap=True)
+        if LOG_STATS:
+            diff[commit.short_id] = \
+                     commit.parents[0].tree.diff_to_tree(commit.tree) \
+                if   len(commit.parents) > 0 \
+                else commit.tree.diff_to_tree(swap=True)
     
     return template(
         'repository/log.html',