diff --git a/Changelog.rst b/Changelog.rst
index 321bf87..9a98d29 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -8,6 +8,8 @@ ChangeLog
 OfflineIMAP v6.5.6.1 (YYYY-MM-DD)
 =================================
 
+* Properly generate tarball from "sdist" command (GitHub #137)
+
 * Expand environment variables in the following
   configuration items:
   - general.pythonfile;
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..3a403a3
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,14 @@
+global-exclude .gitignore .git *.bak *.orig *.rej
+include setup.py
+include COPYING
+include Changelog*
+include MAINTAINERS
+include MANIFEST.in
+include Makefile
+include README.md
+include offlineimap.conf*
+include offlineimap.py
+recursive-include offlineimap *.py
+recursive-include bin *
+recursive-include docs *
+recursive-include test *