diff --git a/speaker/main.go b/speaker/main.go
index 487521e2d63..2e23c78f42a 100644
--- a/speaker/main.go
+++ b/speaker/main.go
@@ -117,7 +117,8 @@ func main() {
 			mconfig.BindPort = mlport
 			mconfig.AdvertisePort = mlport
 		}
-		mconfig.Logger = golog.New(goKitLogWriter{logger}, "", golog.Lshortfile)
+		loggerout := gokitlog.NewStdlibAdapter(gokitlog.With(logger, "component", "MemberList"))
+		mconfig.Logger = golog.New(loggerout, "", golog.Lshortfile)
 		if *mlSecret != "" {
 			sha := sha256.New()
 			mconfig.SecretKey = sha.Sum([]byte(*mlSecret))[:16]
@@ -203,21 +204,6 @@ func watchMemberListEvents(logger gokitlog.Logger, eventCh chan memberlist.NodeE
 	}
 }
 
-type goKitLogWriter struct {
-	gokitlog.Logger
-}
-
-func (l goKitLogWriter) Write(p []byte) (int, error) {
-	if len(p) > 1 {
-		// last char is '\n'
-		err := l.Log("component", "MemberList", "msg", string(p[:len(p)-1]))
-		if err != nil {
-			return 0, err
-		}
-	}
-	return len(p), nil
-}
-
 type controller struct {
 	myNode string