diff --git a/.gitignore b/.gitignore
index 1edc8291..371aa15d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
 _trial_temp
 build
+build-pypy
 MANIFEST
 dist
 apidocs
 *,cover
 .testrepository
 *.pyc
 *.so
 *~
 *.swp
 docs/tutorial/index.html
 dulwich.egg-info/
 .tox/
 .idea/
diff --git a/MANIFEST.in b/MANIFEST.in
index 9b3daeca..bd727e2c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,20 +1,18 @@
 include NEWS
 include AUTHORS
 include README.md
-include README.swift
+include README.swift.md
 include Makefile
 include COPYING
-include HACKING
-include CONTRIBUTING
+include CONTRIBUTING.md
 include TODO
 include setup.cfg
 include dulwich/stdint.h
 recursive-include docs conf.py *.txt Makefile make.bat
 recursive-include examples *.py
 graft dulwich/tests/data
 include tox.ini
 include dulwich.cfg
 include appveyor.yml
 include .testr.conf
 include .travis.yml
-include relicensing-apachev2.txt