diff --git a/.editorconfig b/.editorconfig
index ee03cd17..b1152907 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,3 +20,8 @@ indent_size = 4
 indent_style = tab
 tab_width = 8
 
+# CHTML: 2-space indents
+[**/*.chtml]
+indent_style = space
+indent_size = 2
+
diff --git a/www/kojiweb/externalrepoinfo.chtml b/www/kojiweb/externalrepoinfo.chtml
index aa48ae62..897c7173 100644
--- a/www/kojiweb/externalrepoinfo.chtml
+++ b/www/kojiweb/externalrepoinfo.chtml
@@ -17,13 +17,13 @@
     <tr>
       <th>Tags using this external repo</th>
       <td>
-	#if $len($repoTags)
-	#for $tag in $repoTags
-	<a href="taginfo?tagID=$tag.tag_id">$util.escapeHTML($tag.tag_name)</a><br/>
-	#end for
-	#else
-	No tags
-	#end if
+        #if $len($repoTags)
+        #for $tag in $repoTags
+        <a href="taginfo?tagID=$tag.tag_id">$util.escapeHTML($tag.tag_name)</a><br/>
+        #end for
+        #else
+        No tags
+        #end if
       </td>
     </tr>
   </table>
diff --git a/www/kojiweb/packages.chtml b/www/kojiweb/packages.chtml
index 21cd06f6..16ad4d33 100644
--- a/www/kojiweb/packages.chtml
+++ b/www/kojiweb/packages.chtml
@@ -10,24 +10,24 @@
     #if $tag
     <tr>
       <td colspan="5">
-	<table class="nested">
-	  <tr><td>
+        <table class="nested">
+          <tr><td>
           <strong>Inherited</strong>:
-	  </td><td>
+          </td><td>
           <select name="inherited" class="filterlist" onchange="javascript: window.location = 'packages?inherited=' + this.value + '$util.passthrough_except($self, 'inherited')';">
             <option value="1" #if $inherited then 'selected="selected"' else ''#>yes</option>
             <option value="0" #if not $inherited then 'selected="selected"' else ''#>no</option>
           </select>
-	  </td></tr>
-	  <tr><td>
+          </td></tr>
+          <tr><td>
           <strong>With blocked</strong>:
-	  </td><td>
+          </td><td>
           <select name="blocked" class="filterlist" onchange="javascript: window.location = 'packages?blocked=' + this.value + '$util.passthrough_except($self, 'blocked')';">
             <option value="1" #if $blocked then 'selected="selected"' else ''#>yes</option>
             <option value="0" #if not $blocked then 'selected="selected"' else ''#>no</option>
           </select>
-	  </td></tr>
-	</table>
+          </td></tr>
+        </table>
     </tr>
     #end if
     <tr>
@@ -38,7 +38,7 @@
         #else
         <a href="packages?prefix=$char$util.passthrough($self, 'userID', 'tagID', 'order', 'inherited', 'blocked')">$char</a>
         #end if
-        | 
+        |
         #end for
         #if $prefix
         <a href="packages?${util.passthrough($self, 'userID', 'tagID', 'order', 'inherited', 'blocked')[1:]}">all</a>
diff --git a/www/kojiweb/taginfo.chtml b/www/kojiweb/taginfo.chtml
index b7a768b2..44bcca97 100644
--- a/www/kojiweb/taginfo.chtml
+++ b/www/kojiweb/taginfo.chtml
@@ -102,13 +102,13 @@
     <tr>
       <th>External&nbsp;repos</th>
       <td>
-	#for $external_repo in $external_repos
-	<a href="externalrepoinfo?extrepoID=$external_repo.external_repo_id">$util.escapeHTML($external_repo.external_repo_name)</a> [$external_repo.merge_mode]
-	#if $external_repo.tag_id != $tag.id
-	<span class="smaller">(inherited from <a href="taginfo?tagID=$external_repo.tag_id">$util.escapeHTML($external_repo.tag_name)</a>)</span>
-	#end if
-	<br/>
-	#end for
+        #for $external_repo in $external_repos
+        <a href="externalrepoinfo?extrepoID=$external_repo.external_repo_id">$util.escapeHTML($external_repo.external_repo_name)</a> [$external_repo.merge_mode]
+        #if $external_repo.tag_id != $tag.id
+        <span class="smaller">(inherited from <a href="taginfo?tagID=$external_repo.tag_id">$util.escapeHTML($external_repo.tag_name)</a>)</span>
+        #end if
+        <br/>
+        #end for
       </td>
     </tr>
     #end if