diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 29ed1591b..f466be791 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,4 +8,5 @@
  - fix: Page fails and cannot be edited except through the db if custom rich editor deleted.
  - fix: Search returns not restricted to chosen path or asset type
  - fix: Product Asset - specification labels not showing
-g
+ - fix: Folders displayed for underprivileged users (wouter / Procolix)
+
diff --git a/docs/upgrades/templates-6.99.5/Folder.tmpl b/docs/upgrades/templates-6.99.5/Folder.tmpl
new file mode 100644
index 000000000..f1fe1c93f
--- /dev/null
+++ b/docs/upgrades/templates-6.99.5/Folder.tmpl
@@ -0,0 +1,45 @@
+#PBtmpl0000000000000078
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn> <p><tmpl_var controls></p> </tmpl_if>
+	
+<tmpl_if displayTitle> <h2><tmpl_var title></h2> </tmpl_if>
+		
+<tmpl_if description> <tmpl_var description> </tmpl_if>
+			
+<tmpl_if session.var.adminOn> <p><a href="<tmpl_var addFile.url>"><tmpl_var addFile.label></a></p> </tmpl_if>
+				
+<table width="100%" cellpadding="3" cellspacing="0" class="content"> 
+<tmpl_loop subfolder_loop> 
+
+ <tr>
+ <td class="tableData" valign="top">
+<tmpl_if canView>
+	<a href="<tmpl_var url>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
+	<a href="<tmpl_var url>"><tmpl_var title></a>
+</tmpl_if>
+ </td>
+ <td class="tableData" valign="top" colspan="3">
+ <tmpl_var synopsis>
+ </td>
+ </tr>
+</tmpl_loop>
+				    								
+<tmpl_loop file_loop>
+ <tr>
+ <td valign="top" class="tableData">
+ <tmpl_if session.var.adminOn>
+  <tmpl_if canEdit>
+   <tmpl_var controls>
+  </tmpl_if>
+ </tmpl_if>
+<tmpl_if canView>
+ <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><img src="<tmpl_var icon.small>" border="0" alt="<tmpl_var title>" /></a>
+ <a href="<tmpl_if isFile><tmpl_var file.url><tmpl_else><tmpl_var url></tmpl_if>"><tmpl_var title></a>
+</tmpl_if>
+</td> <td class="tableData" valign="top">
+ <tmpl_var synopsis></td><td class="tableData" valign="top">^D("%z %Z",<tmpl_var date.epoch>);</td>
+ <td class="tableData" valign="top"><tmpl_var size></td></tr>
+</tmpl_loop>
+</table>
+