diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..22fb1f902
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+
+[Makefile]
+indent_style = tab
diff --git a/MANIFEST.in b/MANIFEST.in
index d28274548..a22ec5d8f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include MANIFEST.in
 include TODO
 include setup.cfg
 include setup.py
-recursive-include celery *.py
+
 recursive-include docs *
 recursive-include extra/bash-completion *
 recursive-include extra/centos *
@@ -16,6 +16,8 @@ recursive-include extra/supervisord *
 recursive-include extra/systemd *
 recursive-include extra/zsh-completion *
 recursive-include examples *
-recursive-include requirements *.txt
-prune *.pyc
-prune *.sw*
+recursive-include requirements *.txt *.rst
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+recursive-exclude * .*.sw[a-z]
diff --git a/Makefile b/Makefile
index 2f12b9b20..bbd3db444 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ SPHINX_DIR="docs/"
 SPHINX_BUILDDIR="${SPHINX_DIR}/_build"
 README="README.rst"
 CONTRIBUTING="CONTRIBUTING.rst"
-CONFIGREF_SRC="docs/configuration.rst"
 README_SRC="docs/templates/readme.txt"
 CONTRIBUTING_SRC="docs/contributing.rst"
 SPHINX2RST="sphinx2rst"
diff --git a/docs/changelog.rst b/docs/changelog.rst
deleted file mode 120000
index 262e3d3ee..000000000
--- a/docs/changelog.rst
+++ /dev/null
@@ -1 +0,0 @@
-../Changelog
\ No newline at end of file
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 000000000..5b20da335
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../Changelog