diff --git a/Makefile b/Makefile
index 625948211..c960bfaeb 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
 	install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
 
 .PHONY: all clean install README.md youtube-dl.bash-completion
-# TODO un-phone README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+# TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
 
 youtube-dl: youtube_dl/*.py
 	zip --quiet --junk-paths youtube-dl youtube_dl/*.py
@@ -24,8 +24,8 @@ youtube-dl: youtube_dl/*.py
 youtube-dl.exe: youtube_dl/*.py
 	bash devscripts/wine-py2exe.sh build_exe.py
 
-README.md: youtube-dl
-	@options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
+README.md:
+	@options=$$(COLUMNS=80 python -m youtube_dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
 		header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
 		footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \
 		echo "$${header}" > README.md && \
@@ -44,5 +44,5 @@ youtube-dl.bash-completion: README.md
 		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
 		echo "$${content}" > youtube-dl.bash-completion
 
-LATEST_VERSION: youtube-dl
-	./youtube-dl --version > LATEST_VERSION
+LATEST_VERSION:
+	python -m youtube_dl --version > LATEST_VERSION
diff --git a/README.md b/README.md
index 51501684b..118f9fe64 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ which means you can modify it, redistribute it or use it however you like.
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)
     --dump-user-agent        display the current browser identification
-    --user-agent None        specify a custom user agent
+    --user-agent UA          specify a custom user agent
     --list-extractors        List all supported extractors and the URLs they
                              would handle
 
diff --git a/youtube-dl b/youtube-dl
index 9c78766ff..55d649147 100755
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube-dl.1 b/youtube-dl.1
index 1220a3a57..38e140e7e 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -25,7 +25,7 @@ redistribute it or use it however you like.
 -r,\ --rate-limit\ LIMIT\ \ \ download\ rate\ limit\ (e.g.\ 50k\ or\ 44.6m)
 -R,\ --retries\ RETRIES\ \ \ \ number\ of\ retries\ (default\ is\ 10)
 --dump-user-agent\ \ \ \ \ \ \ \ display\ the\ current\ browser\ identification
---user-agent\ None\ \ \ \ \ \ \ \ specify\ a\ custom\ user\ agent
+--user-agent\ UA\ \ \ \ \ \ \ \ \ \ specify\ a\ custom\ user\ agent
 --list-extractors\ \ \ \ \ \ \ \ List\ all\ supported\ extractors\ and\ the\ URLs\ they
 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ would\ handle
 \f[]