diff --git a/src/command_download.cc b/src/command_download.cc
index 94b06214..956639d5 100644
--- a/src/command_download.cc
+++ b/src/command_download.cc
@@ -467,6 +467,8 @@ initialize_command_download() {
   ADD_CD_VALUE_UNI("size_files",          rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::size_files)));
   ADD_CD_VALUE_UNI("size_bytes",          rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::size_bytes)));
   ADD_CD_VALUE_UNI("size_chunks",         rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::size_chunks)));
+  ADD_CD_VALUE_UNI("size_pex",            rak::on(std::mem_fun(&core::Download::download), std::mem_fun(&torrent::Download::size_pex)));
+  ADD_CD_VALUE_UNI("max_size_pex",        rak::on(std::mem_fun(&core::Download::download), std::mem_fun(&torrent::Download::max_size_pex)));
 
   ADD_CD_VALUE_UNI("completed_bytes",     rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::completed_bytes)));
   ADD_CD_VALUE_UNI("completed_chunks",    rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::completed_chunks)));
diff --git a/src/ui/download.cc b/src/ui/download.cc
index 18e60f36..33aab7ce 100644
--- a/src/ui/download.cc
+++ b/src/ui/download.cc
@@ -160,7 +160,7 @@ Download::create_info() {
   element->push_back("");
   element->push_column("Chunks:",           te_command("cat=$d.get_completed_chunks=,\" / \",$d.get_size_chunks=,\" * \",$d.get_chunk_size="));
   element->push_column("Priority:",         te_command("d.get_priority="));
-  element->push_column("Peer exchange:",    te_command("if=$d.get_peer_exchange=,enabled,disabled"));
+  element->push_column("Peer exchange:",    te_command("cat=$if=$d.get_peer_exchange=\\,enabled\\,disabled,\\ (,$d.get_size_pex=,/,$d.get_max_size_pex=,)"));
 
   element->push_column("State changed:",    te_command("to_elapsed_time=$d.get_state_changed="));