diff --git a/modules/Makefile.am b/modules/Makefile.am
index 0c6c295d6..520807616 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -275,6 +275,16 @@ client_module_LTLIBRARIES += \
 	client/client_directory_user.la \
 	###
 
+#
+# client/directory/list
+#
+
+client_client_directory_list_room_la_SOURCES = client/directory/list/room.cc
+
+client_module_LTLIBRARIES += \
+	client/client_directory_list_room.la \
+	###
+
 #
 # client/voip/
 #
diff --git a/modules/client/directory/list/room.cc b/modules/client/directory/list/room.cc
new file mode 100644
index 000000000..55e4c285e
--- /dev/null
+++ b/modules/client/directory/list/room.cc
@@ -0,0 +1,147 @@
+// Matrix Construct
+//
+// Copyright (C) Matrix Construct Developers, Authors & Contributors
+// Copyright (C) 2016-2018 Jason Volk <jason@zemos.net>
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice is present in all copies. The
+// full license for this software is available in the LICENSE file.
+
+using namespace ircd;
+
+static resource::response
+get__list_room(client &client,
+               const resource::request &request);
+
+static resource::response
+put__list_room(client &client,
+               const resource::request &request);
+
+mapi::header
+IRCD_MODULE
+{
+	"Client 10.5 :Listing rooms"
+};
+
+resource
+list_room_resource
+{
+	"/_matrix/client/r0/directory/list/room/",
+	{
+		"(10.5) Listing rooms",
+		list_room_resource.DIRECTORY
+	}
+};
+
+resource::method
+list_room_put
+{
+	list_room_resource, "PUT", put__list_room,
+	{
+		list_room_put.REQUIRES_AUTH
+	}
+};
+
+resource::response
+put__list_room(client &client,
+               const resource::request &request)
+{
+	if(request.parv.size() < 1)
+		throw m::NEED_MORE_PARAMS
+		{
+			"room_id path parameter required"
+		};
+
+	m::room::id::buf room_id
+	{
+		url::decode(room_id, request.parv[0])
+	};
+
+	const m::room room
+	{
+		room_id
+	};
+
+	if(!exists(room))
+		throw m::NOT_FOUND
+		{
+			"Room %s is not known to this server",
+			string_view{room_id}
+		};
+
+	const m::room::power power
+	{
+		room
+	};
+
+	const bool permitted
+	{
+		// is_oper(request.user_id) ||
+		power(request.user_id, {}, "m.room.history_visibility", "") &&
+		power(request.user_id, {}, "m.room.join_rules", "")
+	};
+
+	if(!permitted)
+		throw m::ACCESS_DENIED
+		{
+			"You do not have permission to list the room on this server"
+		};
+
+	const json::string &visibility
+	{
+		request.at("visibility")
+	};
+
+	return resource::response
+	{
+		client, http::OK
+	};
+}
+
+resource::method
+list_room_get
+{
+	list_room_resource, "GET", get__list_room
+};
+
+resource::response
+get__list_room(client &client,
+               const resource::request &request)
+{
+	if(request.parv.size() < 1)
+		throw m::NEED_MORE_PARAMS
+		{
+			"room_id path parameter required"
+		};
+
+	m::room::id::buf room_id
+	{
+		url::decode(room_id, request.parv[0])
+	};
+
+	const m::room room
+	{
+		room_id
+	};
+
+	if(!exists(room))
+		throw m::NOT_FOUND
+		{
+			"Room %s is not known to this server",
+			string_view{room_id}
+		};
+
+	const string_view &visibility
+	{
+		m::rooms::is_public(room)? "public" : "private"
+	};
+
+	return resource::response
+	{
+		client, json::members
+		{
+			{ "visibility", visibility }
+		}
+	};
+}