diff --git a/components/buffer.js b/components/buffer.js
index a580604..b92e580 100644
--- a/components/buffer.js
+++ b/components/buffer.js
@@ -121,6 +121,10 @@ class LogLine extends Component {
 				${createNick(msg.prefix.name)} changed the topic to: ${linkify(stripANSI(topic))}
 			`;
 			break;
+		case irc.RPL_MOTD:
+			lineClass = "motd";
+			content = msg.params[1];
+			break;
 		default:
 			if (irc.isError(msg.command) && msg.command != irc.ERR_NOMOTD) {
 				lineClass = "error";
diff --git a/lib/irc.js b/lib/irc.js
index 0a3daf8..72eb832 100644
--- a/lib/irc.js
+++ b/lib/irc.js
@@ -17,6 +17,8 @@ export const RPL_TOPICWHOTIME = "333";
 export const RPL_WHOREPLY = "352";
 export const RPL_NAMREPLY = "353";
 export const RPL_ENDOFNAMES = "366";
+export const RPL_MOTD = "372";
+export const RPL_MOTDSTART = "375";
 export const RPL_ENDOFMOTD = "376";
 export const ERR_NOSUCHNICK = "401";
 export const ERR_NOMOTD = "422";
diff --git a/style.css b/style.css
index 39775ce..c063d2f 100644
--- a/style.css
+++ b/style.css
@@ -329,7 +329,7 @@ details summary {
 #buffer .logline-list {
 	padding: 10px;
 }
-#buffer .talk {
+#buffer .talk, #buffer .motd {
 	color: var(--main-color);
 }
 #buffer .error {