diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index b377aef11..3edf2fc25 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -135,7 +135,9 @@
    Kamerbeek / Procolix)
  - fix [ 1479779 ] enable select box in dataform (Martin Kamerbeek / Procolix)
  - fix [ 1478585 ] purgeRevision without warning or confirmation (Martin 
-   Kamerbee / Procolix)
+   Kamerbeek / Procolix)
+ - fix [ 1480536 ] "Add Files" link in Folder template doesn't work (Martin
+   Kamerbeek / Procolix)
  - Added a graphing engine and tied it into the Poll asset (Martin Kamerbeek / Procolix)
 
 6.8.8
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl
index 4c1f52482..00a217ea4 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_file_folder.tmpl
@@ -1,3 +1,4 @@
+#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>
@@ -6,7 +7,7 @@
 		
 <tmpl_if description> <tmpl_var description> </tmpl_if>
 			
-<tmpl_if session.var.adminOn> <p><a href="<tmpl_var url>?func=add&class=WebGUI::Asset::FilePile">Add files.</a></p> </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> 
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 30a3c53b8..7d9ffaa7c 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -168,6 +168,9 @@ sub purgeCache {
 #-------------------------------------------------------------------
 sub view {
 	my $self = shift;
+
+	my $i18n = WebGUI::International->new($self->session, 'Asset_Folder');
+	
 	if ($self->session->user->userId eq '1') {
 		my $out = WebGUI::Cache->new($self->session,"view_".$self->getId)->get;
 		return $out if $out;
@@ -211,6 +214,10 @@ sub view {
 				});
 		}
 	}
+	
+	$vars{'addFile.label'} = $i18n->get('add file label');
+	$vars{'addFile.url'} = $self->getUrl('func=add&class=WebGUI::Asset::FilePile');
+	
        	my $out = $self->processTemplate(\%vars,undef,$self->{_viewTemplate});
 	if ($self->session->user->userId eq '1') {
 		WebGUI::Cache->new($self->session,"view_".$self->getId)->set($out,$self->get("visitorCacheTimeout"));
diff --git a/lib/WebGUI/i18n/English/Asset_Folder.pm b/lib/WebGUI/i18n/English/Asset_Folder.pm
index d531124bd..40e9e52b3 100644
--- a/lib/WebGUI/i18n/English/Asset_Folder.pm
+++ b/lib/WebGUI/i18n/English/Asset_Folder.pm
@@ -63,6 +63,12 @@ to do you want to go to the new Folder?</p>|,
 
 	'folder template body' => {
 		message => q|The following variables are available in Folder Templates:
+<p><b>addFile.url</b><br />
+The url for adding files to the Folder.</p>
+
+<p><b>addFile.label</b><br />
+The internationalized label for adding files to the Folder.</p>
+
 <p><b>subfolder_loop</b><br />
 A loop containing all Folder assets which are children of the Folder.
 
@@ -141,7 +147,7 @@ this variable will be empty
 
 </blockquote>
 		|,
-        	lastUpdated => 1121790331,
+        	lastUpdated => 1146649269,
 	},
 
 	'assetName' => {
@@ -150,6 +156,10 @@ this variable will be empty
 		lastUpdated => 1121703567,
 	},
 
+	'add file label' => {
+		message => q|Add files.|,
+		lastUpdated => 1146649269,
+	},
 };
 
 1;