diff --git a/src/configuration.cpp b/src/configuration.cpp
index 24ecbf9b..f61851f0 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -77,15 +77,15 @@ bool configure(int argc, char **argv)
 
 	po::options_description options("Options");
 	options.add_options()
-		("host,h", po::value<std::string>()->default_value("localhost"), "connect to server at host")
-		("port,p", po::value<int>()->default_value(6600), "connect to server at port")
-		("current-song", po::value<std::string>()->implicit_value("{{{(%l) }{{%a - }%t}}|{%f}}"), "print current song using given format and exit")
-		("config,c", po::value<std::vector<std::string>>(&config_paths)->default_value(default_config_paths, join<std::string>(default_config_paths, " AND ")), "specify configuration file(s)")
+		("host,h", po::value<std::string>()->value_name("HOST")->default_value("localhost"), "connect to server at host")
+		("port,p", po::value<int>()->value_name("PORT")->default_value(6600), "connect to server at port")
+		("current-song", po::value<std::string>()->value_name("FORMAT")->implicit_value("{{{(%l) }{{%a - }%t}}|{%f}}"), "print current song using given format and exit")
+		("config,c", po::value<std::vector<std::string>>(&config_paths)->value_name("PATH")->default_value(default_config_paths, join<std::string>(default_config_paths, " AND ")), "specify configuration file(s)")
 		("ignore-config-errors", "ignore unknown and invalid options in configuration files")
 		("test-lyrics-fetchers", "check if lyrics fetchers work")
-		("bindings,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file")
-		("screen,s", po::value<std::string>(), "specify the startup screen")
-		("slave-screen,S", po::value<std::string>(), "specify the startup slave screen")
+		("bindings,b", po::value<std::string>(&bindings_path)->value_name("PATH")->default_value("~/.ncmpcpp/bindings"), "specify bindings file")
+		("screen,s", po::value<std::string>()->value_name("SCREEN"), "specify the startup screen")
+		("slave-screen,S", po::value<std::string>()->value_name("SCREEN"), "specify the startup slave screen")
 		("help,?", "show help message")
 		("version,v", "display version information")
 	;