diff --git a/Makefile b/Makefile
index b05dcb409..4b7a7d884 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,12 @@ pyflakes:
 pep8:
 	pep8 --config=common/pep8rc master slave
 
-# XXX(sa2ajj): make it a non-phony target
+# TODO(sa2ajj): make it a non-phony target
 artifacts: DEST_DIR := $(CURDIR)/dist
 artifacts:
 	@rm -rf $(DEST_DIR)
 	@mkdir -p $(DEST_DIR)
 	@for name in master slave; do (rm -f $$name/MANIFEST; cd $$name; python setup.py sdist --formats gztar,zip -d $(DEST_DIR)); done
+
+rmpyc:
+	find . \( -name '*.pyc' -o -name '*.pyo' \) -exec rm -v {} \;
diff --git a/master/Makefile b/master/Makefile
index 78cc0b3b5..cf2c4fb93 100644
--- a/master/Makefile
+++ b/master/Makefile
@@ -5,3 +5,5 @@ tutorial:
 	cd docs/tutorial; $(MAKE) html
 pyflakes:
 	pyflakes buildbot
+rmpyc:
+	make -C .. rmpyc