diff --git a/.htaccess b/.htaccess
index 5f6414882..3420313a5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,6 +24,9 @@ AddType audio/ogg .oga
   # Also place auth information into REMOTE_USER for sites running
   # in CGI mode.
 
+  RewriteCond %{REQUEST_URI} ^/\.well\-known/.*
+  RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
diff --git a/mod/_well_known.php b/mod/_well_known.php
index 47cfe1512..46714deaa 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -49,19 +49,12 @@ function _well_known_init(&$a){
 				break;
 
 			default:
-				// look in $WEBROOT/well_known for the requested file in case it is 
-				// something a site requires and for which we do not have a module
-
-				// @fixme - we may need to determine the content-type and stick it in the header
-				// for now this can be done with a php script masquerading as the requested file
-
-				$wk_file = str_replace('.well-known','well_known',$a->cmd);
-				if(file_exists($wk_file)) {
-					echo file_get_contents($wk_file); 
+				if(file_exists($a->cmd)) {
+					echo file_get_contents($a->cmd); 
 					killme();
 				}
-				elseif(file_exists($wk_file . '.php'))
-					require_once($wk_file . '.php');
+				elseif(file_exists($a->cmd . '.php'))
+					require_once($a->cmd . '.php');
 				break;
 
 		}