diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go
index 06773972..f76c1107 100644
--- a/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go
@@ -15,85 +15,17 @@
 package main
 
 import (
-	"flag"
-	"net/http"
 	_ "net/http/pprof"
-	"os"
 
-	"github.com/matrix-org/dendrite/common"
-	"github.com/matrix-org/dendrite/common/config"
-	"github.com/matrix-org/dendrite/roomserver/alias"
-	"github.com/matrix-org/dendrite/roomserver/input"
-	"github.com/matrix-org/dendrite/roomserver/query"
-	"github.com/matrix-org/dendrite/roomserver/storage"
-	"github.com/prometheus/client_golang/prometheus"
-	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
-)
-
-var (
-	logDir     = os.Getenv("LOG_DIR")
-	configPath = flag.String("config", "dendrite.yaml", "The path to the config file. For more information, see the config file in this repository.")
+	"github.com/matrix-org/dendrite/common/basecomponent"
+	"github.com/matrix-org/dendrite/roomserver"
 )
 
 func main() {
-	common.SetupLogging(logDir)
+	base := basecomponent.NewBaseDendrite("RoomServerAPI")
+	defer base.Close() // nolint: errcheck
 
-	flag.Parse()
+	roomserver.SetupRoomServerComponent(base)
 
-	if *configPath == "" {
-		log.Fatal("--config must be supplied")
-	}
-	cfg, err := config.Load(*configPath)
-	if err != nil {
-		log.Fatalf("Invalid config file: %s", err)
-	}
-
-	closer, err := cfg.SetupTracing("DendriteRoomServer")
-	if err != nil {
-		log.WithError(err).Fatalf("Failed to start tracer")
-	}
-	defer closer.Close() // nolint: errcheck
-
-	db, err := storage.Open(string(cfg.Database.RoomServer))
-	if err != nil {
-		panic(err)
-	}
-
-	kafkaProducer, err := sarama.NewSyncProducer(cfg.Kafka.Addresses, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	inputAPI := input.RoomserverInputAPI{
-		DB:                   db,
-		Producer:             kafkaProducer,
-		OutputRoomEventTopic: string(cfg.Kafka.Topics.OutputRoomEvent),
-	}
-
-	inputAPI.SetupHTTP(http.DefaultServeMux)
-
-	queryAPI := query.RoomserverQueryAPI{DB: db}
-
-	queryAPI.SetupHTTP(http.DefaultServeMux)
-
-	aliasAPI := alias.RoomserverAliasAPI{
-		DB:       db,
-		Cfg:      cfg,
-		InputAPI: &inputAPI,
-		QueryAPI: &queryAPI,
-	}
-
-	aliasAPI.SetupHTTP(http.DefaultServeMux)
-
-	// This is deprecated, but prometheus are still arguing on what to replace
-	// it with. Alternatively we could set it up manually.
-	http.DefaultServeMux.Handle("/metrics", prometheus.Handler()) // nolint: staticcheck, megacheck
-
-	log.Info("Started room server on ", cfg.Listen.RoomServer)
-
-	// TODO: Implement clean shutdown.
-	if err := http.ListenAndServe(string(cfg.Listen.RoomServer), nil); err != nil {
-		panic(err)
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Listen.RoomServer))
 }
diff --git a/src/github.com/matrix-org/dendrite/roomserver/roomserver.go b/src/github.com/matrix-org/dendrite/roomserver/roomserver.go
new file mode 100644
index 00000000..8c46d1eb
--- /dev/null
+++ b/src/github.com/matrix-org/dendrite/roomserver/roomserver.go
@@ -0,0 +1,66 @@
+// Copyright 2017 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package roomserver
+
+import (
+	"net/http"
+
+	"github.com/matrix-org/dendrite/common/basecomponent"
+	"github.com/matrix-org/dendrite/roomserver/alias"
+	"github.com/matrix-org/dendrite/roomserver/input"
+	"github.com/matrix-org/dendrite/roomserver/query"
+	"github.com/matrix-org/dendrite/roomserver/storage"
+	"github.com/sirupsen/logrus"
+)
+
+// SetupRoomServerComponent sets up and registers HTTP handlers for the RoomServer
+// component.
+func SetupRoomServerComponent(
+	base *basecomponent.BaseDendrite,
+) {
+	roomserverDB, err := storage.Open(string(base.Cfg.Database.RoomServer))
+	if err != nil {
+		logrus.WithError(err).Panicf("failed to connect to room server db")
+	}
+
+	SetupRoomServerComponentWithDB(base, roomserverDB)
+}
+
+// SetupRoomServerComponentWithDB sets up and registers HTTP handlers for the RoomServer
+// component, reusing the given room server database instance.
+func SetupRoomServerComponentWithDB(
+	base *basecomponent.BaseDendrite, roomserverDB *storage.Database,
+) {
+	inputAPI := input.RoomserverInputAPI{
+		DB:                   roomserverDB,
+		Producer:             base.KafkaProducer,
+		OutputRoomEventTopic: string(base.Cfg.Kafka.Topics.OutputRoomEvent),
+	}
+
+	inputAPI.SetupHTTP(http.DefaultServeMux)
+
+	queryAPI := query.RoomserverQueryAPI{DB: roomserverDB}
+
+	queryAPI.SetupHTTP(http.DefaultServeMux)
+
+	aliasAPI := alias.RoomserverAliasAPI{
+		DB:       roomserverDB,
+		Cfg:      base.Cfg,
+		InputAPI: &inputAPI,
+		QueryAPI: &queryAPI,
+	}
+
+	aliasAPI.SetupHTTP(http.DefaultServeMux)
+}