diff --git a/config.json b/config.json
index de6015a1..e1f477d8 100644
--- a/config.json
+++ b/config.json
@@ -9,7 +9,6 @@
     "xmr.se"
   ],
   "allowCustomHomeservers": true,
-
   "featuredCommunities": {
     "openAsDefault": false,
     "spaces": [
@@ -28,11 +27,16 @@
       "#PrivSec.dev:arcticfoxes.net",
       "#disroot:aria-net.org"
     ],
-    "servers": ["envs.net", "matrix.org", "monero.social", "mozilla.org"]
+    "servers": [
+      "envs.net",
+      "matrix.org",
+      "monero.social",
+      "mozilla.org"
+    ],
+    "directoryServer": "matrixrooms.info"
   },
-
   "hashRouter": {
     "enabled": false,
     "basename": "/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/hooks/router/useExploreSelected.ts b/src/app/hooks/router/useExploreSelected.ts
index be7615ca..7ca00a13 100644
--- a/src/app/hooks/router/useExploreSelected.ts
+++ b/src/app/hooks/router/useExploreSelected.ts
@@ -1,5 +1,6 @@
 import { useMatch, useParams } from 'react-router-dom';
 import { getExploreFeaturedPath, getExplorePath } from '../../pages/pathUtils';
+import { useClientConfig } from '../useClientConfig';
 
 export const useExploreSelected = (): boolean => {
   const match = useMatch({
@@ -26,3 +27,8 @@ export const useExploreServer = (): string | undefined => {
 
   return server;
 };
+
+export const useDirectoryServer = (): string | undefined => {
+  const { featuredCommunities } = useClientConfig();
+  return featuredCommunities?.directoryServer;
+};
diff --git a/src/app/hooks/useClientConfig.ts b/src/app/hooks/useClientConfig.ts
index e5fc6cc6..98d7eb92 100644
--- a/src/app/hooks/useClientConfig.ts
+++ b/src/app/hooks/useClientConfig.ts
@@ -15,6 +15,7 @@ export type ClientConfig = {
     spaces?: string[];
     rooms?: string[];
     servers?: string[];
+    directoryServer?: string;
   };
 
   hashRouter?: HashRouterConfig;
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index 3733b615..4e06830e 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -32,6 +32,7 @@ import {
 } from '../../../components/nav';
 import { getExploreFeaturedPath, getExploreServerPath } from '../../pathUtils';
 import {
+  useDirectoryServer,
   useExploreFeaturedRooms,
   useExploreServer,
 } from '../../../hooks/router/useExploreSelected';
@@ -250,28 +251,31 @@ export function Explore() {
   useNavToActivePathMapper('explore');
   const userId = mx.getUserId();
   const userServer = userId ? getMxIdServer(userId) : undefined;
+  const directoryServer = useDirectoryServer();
   const [bookmarkedServers, addServerBookmark, removeServerBookmark] = useBookmarkedServers();
-
   const selectedServer = useExploreServer();
+
   const exploringFeaturedRooms = useExploreFeaturedRooms();
+  const exploringDirectory = directoryServer !== undefined && selectedServer === directoryServer;
   const exploringUnlistedServer = useMemo(
     () =>
       !(
         selectedServer === undefined ||
         selectedServer === userServer ||
+        exploringDirectory ||
         bookmarkedServers.includes(selectedServer)
       ),
-    [bookmarkedServers, selectedServer, userServer]
+    [bookmarkedServers, selectedServer, userServer, exploringDirectory]
   );
 
   const viewServerCallback = useCallback(
     async (server: string, saveBookmark: boolean) => {
-      if (saveBookmark && server !== userServer && selectedServer) {
+      if (saveBookmark && server !== userServer && server !== directoryServer && selectedServer) {
         await addServerBookmark(server);
       }
       navigate(getExploreServerPath(server));
     },
-    [addServerBookmark, navigate, userServer, selectedServer]
+    [addServerBookmark, navigate, userServer, directoryServer, selectedServer]
   );
 
   const removeServerBookmarkCallback = useCallback(
@@ -312,6 +316,24 @@ export function Explore() {
                 </NavItemContent>
               </NavLink>
             </NavItem>
+            {directoryServer && (
+              <NavItem variant="Background" radii="400" aria-selected={exploringDirectory}>
+                <NavLink to={getExploreServerPath(directoryServer)}>
+                  <NavItemContent>
+                    <Box as="span" grow="Yes" alignItems="Center" gap="200">
+                      <Avatar size="200" radii="400">
+                        <Icon src={Icons.Search} size="100" filled={exploringDirectory} />
+                      </Avatar>
+                      <Box as="span" grow="Yes">
+                        <Text as="span" size="Inherit" truncate>
+                          Public Room Directory
+                        </Text>
+                      </Box>
+                    </Box>
+                  </NavItemContent>
+                </NavLink>
+              </NavItem>
+            )}
             {userServer && (
               <ExploreServerNavItem
                 server={userServer}
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index b26522c0..0c47e5a4 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -9,11 +9,13 @@ import React, {
   useState,
 } from 'react';
 import {
+  Badge,
   Box,
   Button,
   Chip,
   Icon,
   IconButton,
+  IconSrc,
   Icons,
   Input,
   Line,
@@ -49,6 +51,7 @@ import { ScreenSize, useScreenSizeContext } from '../../../hooks/useScreenSize';
 import { BackRouteHandler } from '../../../components/BackRouteHandler';
 import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
 import { useBookmarkedServers } from '../../../hooks/useBookmarkedServers';
+import { useDirectoryServer } from '../../../hooks/router/useExploreSelected';
 
 const useServerSearchParams = (searchParams: URLSearchParams): ExploreServerPathSearchParams =>
   useMemo(
@@ -349,6 +352,7 @@ export function PublicRooms() {
   const mx = useMatrixClient();
   const userId = mx.getUserId();
   const userServer = userId && getMxIdServer(userId);
+  const directoryServer = useDirectoryServer();
   const allRooms = useAtomValue(allRoomsAtom);
   const { navigateSpace, navigateRoom } = useRoomNavigate();
   const screenSize = useScreenSizeContext();
@@ -363,6 +367,15 @@ export function PublicRooms() {
   const [bookmarkedServers, addServerBookmark, removeServerBookmark] = useBookmarkedServers();
   const isUserHomeserver = server !== undefined && server === userServer;
   const isBookmarkedServer = server !== undefined && bookmarkedServers.includes(server);
+  const isDirectoryServer = server !== undefined && server === directoryServer;
+  let headerIcon: IconSrc;
+  if (isUserHomeserver) {
+    headerIcon = Icons.Home;
+  } else if (isDirectoryServer) {
+    headerIcon = Icons.Search;
+  } else {
+    headerIcon = Icons.Server;
+  }
 
   const currentLimit: number = useMemo(() => {
     const limitParam = serverSearchParams.limit;
@@ -526,40 +539,70 @@ export function PublicRooms() {
               )}
             </Box>
             <Box grow="Yes" basis="Yes" justifyContent="Center" alignItems="Center" gap="200">
-              {screenSize !== ScreenSize.Mobile && (
-                <Icon size="400" src={isUserHomeserver ? Icons.Home : Icons.Server} />
-              )}
+              {screenSize !== ScreenSize.Mobile && <Icon size="400" src={headerIcon} />}
               <Text size="H3" truncate>
-                {server}
+                {isDirectoryServer ? 'Public Room Directory' : server}
               </Text>
             </Box>
             <Box shrink="No" grow="Yes" basis="No" justifyContent="End">
-              <TooltipProvider
-                position="Bottom"
-                align="End"
-                offset={4}
-                tooltip={
-                  <Tooltip>
-                    <Text>{isBookmarkedServer ? 'Remove Bookmark' : 'Add Bookmark'}</Text>
-                  </Tooltip>
-                }
-              >
-                {(triggerRef) =>
-                  !isUserHomeserver && (
-                    <IconButton
-                      onClick={() =>
-                        handleBookmarkAction(
-                          isBookmarkedServer ? removeServerBookmark : addServerBookmark
-                        )
-                      }
-                      ref={triggerRef}
-                      disabled={bookmarkActionLoading}
+              {isDirectoryServer ? (
+                <TooltipProvider
+                  position="Bottom"
+                  align="End"
+                  offset={4}
+                  tooltip={
+                    <Tooltip>
+                      <Text>provided by {directoryServer}</Text>
+                    </Tooltip>
+                  }
+                >
+                  {(triggerRef) => (
+                    <Chip
+                      as="a"
+                      href={`https://${directoryServer}`}
+                      target="_blank"
+                      rel="noreferrer noopener"
+                      variant="Secondary"
+                      radii="Pill"
+                      fill="Soft"
+                      ref={screenSize === ScreenSize.Mobile ? triggerRef : undefined}
+                      style={{ maxWidth: '100%' }}
+                      before={<Icon src={Icons.External} size="50" />}
                     >
-                      <Icon size="400" src={Icons.Bookmark} filled={isBookmarkedServer} />
-                    </IconButton>
-                  )
-                }
-              </TooltipProvider>
+                      <Text size="T200" truncate>
+                        provided by {directoryServer}
+                      </Text>
+                    </Chip>
+                  )}
+                </TooltipProvider>
+              ) : (
+                <TooltipProvider
+                  position="Bottom"
+                  align="End"
+                  offset={4}
+                  tooltip={
+                    <Tooltip>
+                      <Text>{isBookmarkedServer ? 'Remove Bookmark' : 'Add Bookmark'}</Text>
+                    </Tooltip>
+                  }
+                >
+                  {(triggerRef) =>
+                    !isUserHomeserver && (
+                      <IconButton
+                        onClick={() =>
+                          handleBookmarkAction(
+                            isBookmarkedServer ? removeServerBookmark : addServerBookmark
+                          )
+                        }
+                        ref={triggerRef}
+                        disabled={bookmarkActionLoading}
+                      >
+                        <Icon size="400" src={Icons.Bookmark} filled={isBookmarkedServer} />
+                      </IconButton>
+                    )
+                  }
+                </TooltipProvider>
+              )}
             </Box>
           </>
         )}