diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index b4d266c43e..a6d3282ce8 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -51,7 +51,7 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
   silence_end_checkbox (_("Add silence at end:")),
   silence_end_clock ("silence_end", true, "", true, false, true),
 
-  command_label(_("Command to run post-export\n(%f=full path & filename, %d=directory, %b=basename, %u=username, %p=password):")),
+  command_label(_("Command to run post-export\n(%f=full path & filename, %d=directory, %b=basename):")),
 
   format_table (3, 4),
   compatibility_label (_("Compatibility"), Gtk::ALIGN_LEFT),
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 89e4d96955..4368d54430 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -314,20 +314,19 @@ ExportHandler::finish_timespan ()
 #if 0			// would be nicer with C++11 initialiser...
 			std::map<char, std::string> subs {
 				{ 'f', filename },
-				{ 'd', Glib::path_get_dirname(filename) },
+				{ 'd', Glib::path_get_dirname(filename)  + G_DIR_SEPARATOR },
 				{ 'b', PBD::basename_nosuffix(filename) },
-				{ 'u', upload_username },
-				{ 'p', upload_password}
+				...
 			};
 #endif
 
 			PBD::ScopedConnection command_connection;
 			std::map<char, std::string> subs;
 			subs.insert (std::pair<char, std::string> ('f', filename));
-			subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname(filename)));
-			subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix(filename)));
-			subs.insert (std::pair<char, std::string> ('u', soundcloud_username));
-			subs.insert (std::pair<char, std::string> ('p', soundcloud_password));
+			subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname (filename) + G_DIR_SEPARATOR));
+			subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix (filename)));
+			subs.insert (std::pair<char, std::string> ('s', session.path ()));
+			subs.insert (std::pair<char, std::string> ('n', session.name ()));
 
 
 			std::cerr << "running command: " << fmt->command() << "..." << std::endl;