diff --git a/Makefile.am b/Makefile.am
index addfa0c..104d370 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,8 +37,39 @@
 SUBDIRS += tutorial
 endif
 
+clean-local:
+	$(RM) -r vendor/
+
+distclean-local:
+	$(RM) -r .dub/
+	$(RM) -r autom4te.cache/
+
+CLEANFILES = \
+	composer.lock \
+	dub.selections.json
+
+DISTCLEANFILES = \
+	Makefile \
+	Makefile.in \
+	apache-thrift-test-library \
+	autoscan.log \
+	compile \
+	config.guess \
+	config.hin \
+	config.hin~ \
+	config.log \
+	config.status \
+	config.sub \
+	configure \
+	configure.scan \
+    debcomp \
+    install-sh \
+    ltmain.sh \
+    missing \
+    ylwrap
+
 dist-hook:
-	find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf
+	find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -f
 	find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf
 	find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf
 
@@ -109,27 +140,30 @@
 
 EXTRA_DIST = \
 	.clang-format \
+	.dockerignore \
 	.editorconfig \
 	.travis.yml \
 	.rustfmt.toml \
-	.dockerignore \
+	ApacheThrift.nuspec \
 	appveyor.yml \
+	bootstrap.sh \
 	bower.json \
 	build \
-	bootstrap.sh \
-	cleanup.sh \
+	CHANGES.md \
 	CMakeLists.txt \
 	composer.json \
 	contrib \
 	CONTRIBUTING.md \
 	debian \
-	doc \
 	doap.rdf \
-	package.json \
-	sonar-project.properties \
+	doc \
+	dub.json \
+	jitpack.yml \
 	LANGUAGES.md \
 	LICENSE \
-	CHANGES.md \
 	NOTICE \
+	package.json \
+	phpcs.xml.dist \
 	README.md \
+	sonar-project.properties \
 	Thrift.podspec