diff --git a/Makefile b/Makefile
index 16f1388c..49a335b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,29 @@
 SETUP = python3 setup.py
 
-.PHONY: default clean build sdist bdist bdist_egg install release
+.PHONY: default i test clean all html rst build sdist bdist bdist_egg bdist_wheel install rst release
 
 default: i
 
 i:
-	@(cd src/; python -i -c 'import you_get; print("You-Get %s (%s)\n>>> import you_get" % (you_get.__version__, you_get.__date__))')
+	@(cd src/; python3 -i -c 'import you_get; print("You-Get %s\n>>> import you_get" % you_get.version.__version__)')
 
 test:
 	$(SETUP) test
 
 clean:
 	zenity --question
+	rm -f README.rst
 	rm -fr build/ dist/ src/*.egg-info/
 	find . | grep __pycache__ | xargs rm -fr
 	find . | grep .pyc | xargs rm -f
 
-all: build sdist bdist bdist_egg
+all: rst build sdist bdist bdist_egg bdist_wheel
+
+html:
+	pandoc README.md > README.html
+
+rst:
+	pandoc -s -t rst README.md > README.rst
 
 build:
 	$(SETUP) build
@@ -30,9 +37,12 @@ bdist:
 bdist_egg:
 	$(SETUP) bdist_egg
 
-install: bdist_egg
-	sudo $(SETUP) install
+bdist_wheel:
+	$(SETUP) bdist_wheel
 
-release:
+install: bdist_wheel
+	$(SETUP) install
+
+release: rst
 	zenity --question
-	$(SETUP) sdist bdist_egg upload
+	$(SETUP) sdist bdist_wheel upload