diff --git a/Makefile b/Makefile
index fa19349..a22d4bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CFLAGS = -Wall -g -O0 -DHAVE_ZLIB -DENABLE_COLOR
 LFLAGS = -L. -ltelnet -lz
 
-all: telnet-proxy telnet-client
+all: telnet-proxy telnet-client telnet-chatd
 
 %.o: %.c libtelnet.h
 	$(CC) -o $@ -c $(CFLAGS) $<
@@ -15,16 +15,19 @@
 telnet-client: telnet-client.o libtelnet.a Makefile
 	$(CC) -o $@ $(CFLAGS) $< $(LFLAGS)
 
+telnet-chatd: telnet-chatd.o libtelnet.a Makefile
+	$(CC) -o $@ $(CFLAGS) $< $(LFLAGS)
+
 clean:
 	rm -f libtelnet.a libtelnet.o telnet-proxy telnet-proxy.o \
-		telnet-client telnet-client.o
+		telnet-client telnet-client.o telnet-chatd telnet-chatd.c
 
 dist:
 	rm -fr libtelnet-dist
 	rm -f libtelnet-dist.tar.gz
 	mkdir libtelnet-dist
 	cp Makefile README libtelnet.h libtelnet.c telnet-proxy.c \
-		telnet-client.c libtelnet-dist
+		telnet-client.c telnet-chatd.c libtelnet-dist
 	tar -cf libtelnet-dist.tar libtelnet-dist
 	gzip libtelnet-dist.tar
 	rm -fr libtelnet-dist