diff --git a/examples/echoclient/LICENSE.md b/examples/echoclient/LICENSE.md
new file mode 100644
index 0000000..b55eb8f
--- /dev/null
+++ b/examples/echoclient/LICENSE.md
@@ -0,0 +1,2 @@
+The `Main.hs', `Setup.hs', and `echoclient.cabal' files in this directory are in
+the public domain.
diff --git a/examples/echoclient/EchoClient.hs b/examples/echoclient/Main.hs
similarity index 88%
rename from examples/echoclient/EchoClient.hs
rename to examples/echoclient/Main.hs
index bbcc37a..a168968 100644
--- a/examples/echoclient/EchoClient.hs
+++ b/examples/echoclient/Main.hs
@@ -1,16 +1,11 @@
 {-
 
-
-Copyright © 2010-2012 Jon Kristensen, Philipp Balzarek
-
-This file (EchoClient.hs) illustrates how to connect, authenticate, set a simple
-presence, receive message stanzas, and echo them back to whoever is sending
-them, using Pontarius. The contents of this file may be used freely, as if it is
-in the public domain.
+This directory defines a project that illustrates how to connect, authenticate,
+set a simple presence, receive message stanzas, and echo them back to whoever is
+sending them, using Pontarius XMPP. This file is in the public domain.
 
 -}
 
-
 {-# LANGUAGE OverloadedStrings #-}
 
 module Main where
diff --git a/examples/echoclient/README.md b/examples/echoclient/README.md
new file mode 100644
index 0000000..48cad78
--- /dev/null
+++ b/examples/echoclient/README.md
@@ -0,0 +1,6 @@
+This directory defines a project that illustrates how to connect, authenticate,
+set a simple presence, receive message stanzas, and echo them back to whoever is
+sending them, using Pontarius XMPP.
+
+The `Main.hs', `Setup.hs', and `echoclient.cabal' files in this directory may be
+used freely, as they are in the public domain.
diff --git a/examples/echoclient/Setup.hs b/examples/echoclient/Setup.hs
new file mode 100644
index 0000000..9a994af
--- /dev/null
+++ b/examples/echoclient/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/examples/echoclient/echoclient.cabal b/examples/echoclient/echoclient.cabal
index c50f62d..e9f3297 100755
--- a/examples/echoclient/echoclient.cabal
+++ b/examples/echoclient/echoclient.cabal
@@ -1,3 +1,8 @@
+-- This directory defines a project that illustrates how to connect,
+-- authenticate, set a simple presence, receive message stanzas, and echo them
+-- back to whoever is sending them, using Pontarius XMPP. This file is in the
+-- public domain.
+
 Name:           echoclient
 Version:        0.0.0.0
 Cabal-Version:  >= 1.6
@@ -9,4 +14,4 @@ Synopsis:       Echo client test program for Pontarius XMPP
 
 Executable echoclient
   Build-Depends:  base, data-default, hslogger, mtl, pontarius-xmpp, text, tls
-  Main-Is:        EchoClient.hs
\ No newline at end of file
+  Main-Is:        Main.hs
\ No newline at end of file