diff --git a/Makefile b/Makefile
index 428aaf225..d48485567 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
 
 clean:
-	rm -rf README-wide.md youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
 	find . -name "*.pyc" -delete
 
 PREFIX ?= /usr/local
@@ -73,11 +73,10 @@ supportedsites:
 README.txt: README.md
 	pandoc -f markdown -t plain README.md -o README.txt
 
-youtube-dl.1: youtube_dl/*.py youtube_dl/*/*.py
-	COLUMNS=65536 python youtube_dl/__main__.py --help | python devscripts/make_readme.py README.md > README-wide.md
-	python devscripts/prepare_manpage.py README-wide.md > youtube-dl.1.temp.md
+youtube-dl.1: README.md
+	python devscripts/prepare_manpage.py README.md > youtube-dl.1.temp.md
 	pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
-	rm -f youtube-dl.1.temp.md README-wide.md
+	rm -f youtube-dl.1.temp.md
 
 youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
 	python devscripts/bash-completion.py
diff --git a/devscripts/prepare_manpage.py b/devscripts/prepare_manpage.py
index cc7215257..06cea7e54 100644
--- a/devscripts/prepare_manpage.py
+++ b/devscripts/prepare_manpage.py
@@ -19,16 +19,19 @@ def filter_options(readme):
             else:
                 in_options = False
 
-        if in_options and line.lstrip().startswith('-'):
-            option, description = re.split(r'\s{2,}', line.lstrip())
-            split_option = option.split(' ')
+        if in_options:
+            if line.lstrip().startswith('-'):
+                option, description = re.split(r'\s{2,}', line.lstrip())
+                split_option = option.split(' ')
 
-            if not split_option[-1].startswith('-'):  # metavar
-                option = ' '.join(split_option[:-1] + ['*%s*' % split_option[-1]])
+                if not split_option[-1].startswith('-'):  # metavar
+                    option = ' '.join(split_option[:-1] + ['*%s*' % split_option[-1]])
 
-            # Pandoc's definition_lists. See http://pandoc.org/README.html
-            # for more information.
-            ret += '%s\n:   %s\n\n' % (option, description)
+                # Pandoc's definition_lists. See http://pandoc.org/README.html
+                # for more information.
+                ret += '\n%s\n:   %s\n' % (option, description)
+            else:
+                ret += line.lstrip() + '\n'
         else:
             ret += line + '\n'