diff --git a/.gitignore b/.gitignore
index c6ff05a..1297230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.py[co]
+__pycache__
 *.spec
 .*.sw[o-z]
 MANIFEST
@@ -13,6 +14,8 @@ docs/ovirtlago.rst
 docs/lago.rst
 docs/lago.plugins.rst
 docs/lago_template_repo.rst
+docs/_build/
+docs/_static/ChangeLog.txt
 *ChangeLog
 rpmbuild
 lago.egg-info
@@ -20,5 +23,13 @@ AUTHORS
 */*venv
 .bash*
 .cache*
+.coverage
+.eggs/
+.tox/
+coverage.xml
+flake8.txt
+htmlcov/
 tags
 cscope.out
+lago.junit.xml
+lago_ovirt.egg-info/
diff --git a/Makefile b/Makefile
index a5e8197..4ab4785 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,14 @@ TARBALL_FILE=${TAR_FILE}.gz
 SPECFILE=${NAME}.spec
 # this is needed to use the libs from venv
 
-OUTPUT_DIR=${PWD}
+OUTPUT_DIR=$(CURDIR)
 RPM_DIR=${OUTPUT_DIR}/rpmbuild
 DIST_DIR=${OUTPUT_DIR}/dist
 
 TAR_DIST_LOCATION=${DIST_DIR}/${TAR_FILE}
 TARBALL_DIST_LOCATION=${DIST_DIR}/${TARBALL_FILE}
 
-.PHONY: build rpm srpm ${TARBALL_DIST_LOCATION} check-local dist check ${SPECFILE} docs fullchangelog changelog python-sdist add-extra-files-sdist
+.PHONY: build rpm srpm ${TARBALL_DIST_LOCATION} check-local dist check ${SPECFILE} docs fullchangelog changelog python-sdist add-extra-files-sdist clean distclean
 
 changelog:
 	echo Creating RPM compatible ChangeLog \
@@ -90,8 +90,24 @@ clean:
 	rm -rf ${DIST_DIR}
 	rm -rf ${RPM_DIR}
 	rm -rf build "$(REPO_LOCAL_REL_PATH)"
+	rm -rf docs/_build
+	rm -rf htmlcov
+	find -name __pycache__ -type d | xargs -r rm -r
+	find -name flake8.txt -exec rm {} \;
 	rm -f ${SPECFILE}
 	rm -f AUTHORS
+	rm -f ChangeLog
+	rm -f FullChangeLog
+	rm -f .coverage
+	rm -f coverage.xml
+	rm -f lago.junit.xml
+	rm -f docs/_static/ChangeLog.txt
+	rm -f docs/ovirtlago.rst
+
+distclean: clean
+	rm -rf .eggs
+	rm -rf .tox
+	rm -rf lago_ovirt.egg-info
 
 docs:
 	tox -r -e docs