diff --git a/mod/directory.php b/mod/directory.php
index 6aa890226..01cb1a3ff 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -10,10 +10,16 @@ function directory_content(&$a) {
 
 	$tpl .= load_view_file('view/directory_header.tpl');
 
-	
+	$globaldir = '';
+	$gdirpath = dirname(get_config('system','directory_submit_url'));
+	if(strlen($gdirpath)) {
+		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
+		. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+	}
 
 	$o .= replace_macros($tpl, array(
 		'$search' => $search,
+		'$globaldir' => $globaldir,
 		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")
 	));
 
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index ba39236f2..03eed62b3 100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -1,6 +1,6 @@
 <h1>Site Directory</h1>
 
-<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Directory</a></div></li></ul>
+$globaldir
 
 $finding