diff --git a/COPYING.txt b/COPYING
similarity index 100%
rename from COPYING.txt
rename to COPYING
diff --git a/MANIFEST.in b/MANIFEST.in
index 0ce4d4d2..1b45f955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
-include README.txt INSTALL.txt COPYING.txt TODO.txt UPGRADING.txt
-include MANIFEST.in ChangeLog.txt
+include readme.txt doc/install.txt COPYING doc/todo.txt doc/upgrading.txt
+include MANIFEST.in doc/changelog.txt
 include config/linkchecker-completion config/create.sql
 include config/linkcheckerrc config/logging.conf config/pycheckrc
 include config/reindent.py config/linkchecker.apache2.conf install-rpm.sh
diff --git a/Makefile b/Makefile
index 424f59a3..d2121b10 100644
--- a/Makefile
+++ b/Makefile
@@ -114,8 +114,8 @@ filescheck:
 
 .PHONY: releasecheck
 releasecheck: check
-	@if egrep -i "xx\.|xxxx|\.xx" ChangeLog.txt > /dev/null; then \
-	  echo "Could not release: edit ChangeLog.txt release date"; false; \
+	@if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \
+	  echo "Could not release: edit doc/changelog.txt release date"; false; \
 	fi
 #	$(MAKE) -C doc test
 
@@ -156,7 +156,7 @@ diff:
 
 .PHONY: changelog
 changelog:
-	sftrack_changelog linkchecker calvin@users.sourceforge.net ChangeLog.txt
+	sftrack_changelog linkchecker calvin@users.sourceforge.net doc/changelog.txt
 
 .PHONY: gui
 gui:
diff --git a/debian/linkchecker.docs b/debian/linkchecker.docs
index 3d7c7365..a332b838 100644
--- a/debian/linkchecker.docs
+++ b/debian/linkchecker.docs
@@ -1,6 +1,6 @@
 debian/README.Debian
-TODO.txt
-UPGRADING.txt
+doc/todo.txt
+doc/upgrading.txt
 doc/html/index.html
 doc/html/logo64x64.png
 doc/html/*.css
diff --git a/debian/rules b/debian/rules
index 5aa65ffa..d356c8b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM:=pycentral
-DEB_DH_INSTALLCHANGELOGS_ARGS:=ChangeLog.txt
+DEB_DH_INSTALLCHANGELOGS_ARGS:=doc/changelog.txt
 
 # workaround for Debian bug #486848
 binary-arch binary-indep: install-arch install-indep
diff --git a/ChangeLog.txt b/doc/changelog.txt
similarity index 100%
rename from ChangeLog.txt
rename to doc/changelog.txt
diff --git a/INSTALL.txt b/doc/install.txt
similarity index 100%
rename from INSTALL.txt
rename to doc/install.txt
diff --git a/TODO.txt b/doc/todo.txt
similarity index 100%
rename from TODO.txt
rename to doc/todo.txt
diff --git a/UPGRADING.txt b/doc/upgrading.txt
similarity index 100%
rename from UPGRADING.txt
rename to doc/upgrading.txt
diff --git a/README.txt b/readme.txt
similarity index 100%
rename from README.txt
rename to readme.txt