diff --git a/doc/rtorrent.1 b/doc/rtorrent.1
index 627e33e2..8378e2d4 100644
--- a/doc/rtorrent.1
+++ b/doc/rtorrent.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "RTORRENT" "1" "24 March 2007" "BitTorrent client for ncurses" ""
+.TH "RTORRENT" "1" "20 June 2007" "BitTorrent client for ncurses" ""
.SH NAME
rtorrent \- a BitTorrent client for ncurses
@@ -358,6 +358,12 @@ peers we want. A negative value disables this feature.
\fBuse_udp_trackers = \fIyes\fB\fR
Use UDP trackers. Disable if you are behind a firewall, etc, that does
not allow connections to UDP trackers.
+.TP
+\fBhttp_capath = \fIpath\fB\fR
+.TP
+\fBhttp_cacert = \fIfilename\fB\fR
+Set the certificates to use in http requests. See Curl's
+CURLOPT_CAPATH and CURLOPT_CAINFO options for further information.
.SH "USER-INTERFACE SETTINGS"
.PP
Display related settings.
diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml
index bc5b26da..0b50a4ea 100644
--- a/doc/rtorrent.1.xml
+++ b/doc/rtorrent.1.xml
@@ -699,6 +699,15 @@ not allow connections to UDP trackers.
+
+ http_capath = path
+ http_cacert = filename
+
+Set the certificates to use in http requests. See Curl's
+CURLOPT_CAPATH and CURLOPT_CAINFO options for further information.
+
+
+
diff --git a/src/command_events.cc b/src/command_events.cc
index c4248066..f48a36b1 100644
--- a/src/command_events.cc
+++ b/src/command_events.cc
@@ -229,7 +229,7 @@ apply_download_list(const torrent::Object& rawArgs) {
core::ViewManager* viewManager = control->view_manager();
core::ViewManager::iterator viewItr;
- if (argsItr != args.end())
+ if (argsItr != args.end() && !(argsItr++)->as_string().empty())
viewItr = viewManager->find((argsItr++)->as_string());
else
viewItr = viewManager->find("main");