diff --git a/Makefile b/Makefile
index 8d1c3ae..58ef75b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,35 @@
-nyancat: nyancat.c
-	gcc -o nyancat nyancat.c
+package = nyancat
+version = 0.1
+tarname = $(package)
+distdir = $(tarname)-$(version)
+
+all clean check parser:
+	cd src && $(MAKE) $@
+
+dist: $(distdir).tar.gz
+
+$(distdir).tar.gz: $(distdir)
+	tar chof - $(distdir) | gzip -9 -c > $@
+	rm -rf $(distdir)
+
+$(distdir): FORCE
+	mkdir -p $(distdir)/src
+	cp Makefile $(distdir)
+	cp src/Makefile $(distdir)/src
+	cp src/nyancat.c $(distdir)/src
+	cp src/nyancat.py $(distdir)/src
+	cp src/telnetsrvlib.py $(distdir)/src
+
+FORCE:
+	-rm $(distdir).tar.gz >/dev/null 2>&1
+	-rm -rf $(distdir) >/dev/null 2>&1
+
+distcheck: $(distdir).tar.gz
+	gzip -cd $(distdir).tar.gz | tar xvf -
+	cd $(distdir) && $(MAKE) all
+	cd $(distdir) && $(MAKE) check
+	cd $(distdir) && $(MAKE) clean
+	rm -rf $(distdir)
+	@echo "*** Package $(distdir).tar.gz is ready for distribution."
+
+.PHONY: FORCE all clean check dist distcheck
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..1701c11
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,15 @@
+OBJECTS = nyancat.o
+
+all: nyancat
+
+nyancat: $(OBJECTS)
+	$(CC) $(LFLAGS) $(OBJECTS) -o $@
+
+clean:
+	-rm -f $(OBJECTS) nyancat
+
+check: all
+	# Unit tests go here. None currently.
+	@echo "*** ALL TESTS PASSED ***"
+
+.PHONY: all clean check
diff --git a/nyancat.c b/src/nyancat.c
similarity index 100%
rename from nyancat.c
rename to src/nyancat.c
diff --git a/nyancat.py b/src/nyancat.py
similarity index 100%
rename from nyancat.py
rename to src/nyancat.py
diff --git a/telnetsrvlib.py b/src/telnetsrvlib.py
similarity index 100%
rename from telnetsrvlib.py
rename to src/telnetsrvlib.py