diff --git a/.flake8 b/.flake8
new file mode 100644
index 00000000..65dba9aa
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,20 @@
+[flake8]
+select = I,C,F4
+ignore = F
+exclude = .git,
+          __pycache__,
+          tests,
+          docs,
+          ./koji-*
+filename = *.py
+           ./cli/koji
+           ./builder/kojid
+           ./builder/mergerepos
+           ./hub/rpmdiff
+           ./util/kojira
+           ./util/koji-gc
+           ./util/koji-shadow
+           ./util/koji-sweep-db
+           ./vm/kojivmd
+application_import_names = koji,koji_cli,kojihub,kojiweb,__main__
+import_order_style = pep8
diff --git a/Makefile b/Makefile
index a1b9496f..995b23f5 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,9 @@ pypi:
 pypi-upload:
 	twine upload dist/*
 
+flake8:
+	flake8
+
 tag::
 	git tag -a $(TAG)
 	@echo "Tagged with: $(TAG)"