diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..bcbc423f1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,29 @@
+help:
+	@echo "  env		create a development environment using virtualenv"
+	@echo "  deps		install dependencies"
+	@echo "  clean		remove unwanted stuff"
+	@echo "  lint		check style with flake8"
+	@echo "  test		run tests"
+
+env:
+	sudo easy_install pip && \
+	pip install virtualenv && \
+	virtualenv env && \
+	. env/bin/activate && \
+	make deps
+
+deps:
+	pip install -r requirements.txt
+
+clean:
+	rm -fr build
+	rm -fr dist
+	find . -name '*.pyc' -exec rm -f {} \;
+	find . -name '*.pyo' -exec rm -f {} \;
+	find . -name '*~' -exec rm -f {} \;
+
+lint:
+	flake8 telegram
+
+test:
+	python telegram_test.py
diff --git a/telegram_test.py b/telegram_test.py
new file mode 100644
index 000000000..d00c23f48
--- /dev/null
+++ b/telegram_test.py
@@ -0,0 +1,5 @@
+import unittest
+
+if __name__ == '__main__':
+    testsuite = unittest.TestLoader().discover('.')
+    unittest.TextTestRunner(verbosity=1).run(testsuite)