diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst
index 88af70c1f..800abb4f5 100644
--- a/admin_manual/issues/general_troubleshooting.rst
+++ b/admin_manual/issues/general_troubleshooting.rst
@@ -270,14 +270,19 @@ If your Nextcloud instance is installed in a subfolder called ``nextcloud`` and
 you're running Apache create or edit the :file:`.htaccess` file within the
 document root of your Web server and add the following lines::
 
-    RewriteRule ^\.well-known/host-meta /nextcloud/public.php?service=host-meta [QSA,L]
-    RewriteRule ^\.well-known/host-meta\.json /nextcloud/public.php?service=host-meta-json [QSA,L]
-    RewriteRule ^\.well-known/webfinger /nextcloud/public.php?service=webfinger [QSA,L]
-    RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav/ [R=301,L]
-    RewriteRule ^\.well-known/caldav /nextcloud/remote.php/dav/ [R=301,L]
+    <IfModule mod_rewrite.c>
+      RewriteEngine on
+      RewriteRule ^\.well-known/host-meta /nextcloud/public.php?service=host-meta [QSA,L]
+      RewriteRule ^\.well-known/host-meta\.json /nextcloud/public.php?service=host-meta-json [QSA,L]
+      RewriteRule ^\.well-known/webfinger /nextcloud/public.php?service=webfinger [QSA,L]
+      RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav/ [R=301,L]
+      RewriteRule ^\.well-known/caldav /nextcloud/remote.php/dav/ [R=301,L]
+    </IfModule>
 
 Make sure to change /nextcloud to the actual subfolder your Nextcloud instance is running in.
 
+If you are running NGINX, make sure ``location = /.well-known/carddav {`` and ``location = /.well-known/caldav {`` are properly configured as described in :doc:`../installation/nginx`, adapt to use a subfolder if necessary. 
+
 Now change the URL in the client settings to just use:
 
 ``https://example.com``