diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 27dea430d8..b66e2d3986 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -248,6 +248,7 @@
                    <menu action='AudioFileFormatData'>
 		        <menuitem action='FileDataFormatFloat'/>
 		        <menuitem action='FileDataFormat24bit'/>
+		        <menuitem action='FileDataFormat16bit'/>
 		   </menu>
                    <menu action='AudioFileFormatHeader'>
 		        <menuitem action='FileHeaderFormatBWF'/>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 8d27f563d8..b58990b0d6 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2629,6 +2629,9 @@ ARDOUR_UI::use_config ()
 	case FormatInt24:
 		act = ActionManager::get_action (X_("options"), X_("FileDataFormat24bit"));
 		break;
+	case FormatInt16:
+		act = ActionManager::get_action (X_("options"), X_("FileDataFormat16bit"));
+		break;
 	}
 
 	if (act) {
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 68820612ce..0ee4adae8f 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -483,6 +483,7 @@ ARDOUR_UI::install_actions ()
 
 	act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit floating point"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat));
 	act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit signed integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24));
+	act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit signed integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16));
 
 	RadioAction::Group monitoring_group;
 
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 813c615d39..4a6bef6b5f 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -135,6 +135,9 @@ ARDOUR_UI::set_native_file_data_format (SampleFormat sf)
 	case FormatInt24:
 		action = X_("FileDataFormat24bit");
 		break;
+	case FormatInt16:
+		action = X_("FileDataFormat16bit");
+		break;
 	default:
 		fatal << string_compose (_("programming error: %1"), "illegal file data format in ::set_native_file_data_format") << endmsg;
 		/*NOTREACHED*/
@@ -692,6 +695,10 @@ ARDOUR_UI::map_file_data_format ()
 		action = X_("FileDataFormat24bit");
 		break;
 
+	case FormatInt16:
+		action = X_("FileDataFormat16bit");
+		break;
+
 	default:
 		fatal << string_compose (_("programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"), 
 					 Config->get_native_file_data_format()) << endmsg;
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index a56bcc1c70..263ac0c31f 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -352,7 +352,9 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 				
 				switch (resx) {
 				case 0: /* stop a multi-file import */
-				case 1: /* don't import this one */
+					ret = -2;
+					goto out;
+				case 1: /* don't embed this one */
 					ret = -1;
 					goto out;
 				case 2: /* do it, and the rest without asking */