diff --git a/htconfig.php b/htconfig.php
index 4208924cfd..4c88b6e742 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -94,3 +94,7 @@ $a->config['system']['lockpath'] = "";
 
 // Use the old style "share"
 // $a->config['system']['old_share'] = false;
+
+//Deny public access to the local directory
+//$a->config['system']['block_local_dir'] = false;
+
diff --git a/mod/directory.php b/mod/directory.php
index 7fab53b680..b13e17627a 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -29,7 +29,8 @@ function directory_content(&$a) {
 
 	require_once("mod/proxy.php");
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || 
+                (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
diff --git a/mod/poco.php b/mod/poco.php
index 86b43d651d..89f2f879a0 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -5,7 +5,7 @@ function poco_init(&$a) {
 
 	$system_mode = false;
 
-	if(intval(get_config('system','block_public')))
+	if(intval(get_config('system','block_public')) || (get_config('system','block_local_dir')))
 		http_status_exit(401);