diff --git a/Makefile.am b/Makefile.am
index df72d05..0eccbf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,11 +16,11 @@ libtelnet_la_LDFLAGS = -version-info 1:0:0
 
 bin_PROGRAMS = telnet-client telnet-chatd telnet-proxy
 
-telnet_client_SOURCES = telnet-client.c libtelnet.h
+telnet_client_SOURCES = util/telnet-client.c libtelnet.h
 telnet_client_LDADD = libtelnet.la
 
-telnet_chatd_SOURCES = telnet-chatd.c libtelnet.h
+telnet_chatd_SOURCES = util/telnet-chatd.c libtelnet.h
 telnet_chatd_LDADD = libtelnet.la
 
-telnet_proxy_SOURCES = telnet-proxy.c libtelnet.h
+telnet_proxy_SOURCES = util/telnet-proxy.c libtelnet.h
 telnet_proxy_LDADD = libtelnet.la
diff --git a/telnet-chatd.c b/util/telnet-chatd.c
similarity index 100%
rename from telnet-chatd.c
rename to util/telnet-chatd.c
diff --git a/telnet-client.c b/util/telnet-client.c
similarity index 100%
rename from telnet-client.c
rename to util/telnet-client.c
diff --git a/telnet-proxy.c b/util/telnet-proxy.c
similarity index 100%
rename from telnet-proxy.c
rename to util/telnet-proxy.c