Index: /branches/release-40/default_templates/entry.mtml
===================================================================
--- /branches/release-40/default_templates/entry.mtml (revision 2553)
+++ /branches/release-40/default_templates/entry.mtml (revision 2593)
@@ -57,5 +57,6 @@
                                 </div>
                                 <div class="asset-footer">
-<MTIfNonEmpty tag="EntryCategory">
+<mt:IfArchiveTypeEnabled archive_type="Category">
+    <mt:If tag="MTEntryCategories">
                                     <div class="entry-categories">
                                         <h4 class="entry-categories-header"><__trans phrase="Categories"><span class="delimiter">:</span></h4>
@@ -64,5 +65,6 @@
                                         </ul>
                                     </div>
-</MTIfNonEmpty>
+    </mt:If>
+</mt:IfArchiveTypeEnabled>
 <MTEntryIfTagged>
                                     <div class="entry-tags">