diff --git a/src/converter/converter.cpp b/src/converter/converter.cpp
index 99da0de1..f325a3bb 100644
--- a/src/converter/converter.cpp
+++ b/src/converter/converter.cpp
@@ -158,12 +158,12 @@ void GeometryConverter::convert(const std::string &inputFile,
 	std::ostringstream os;
 
 	SLog(EInfo, "Beginning conversion ..");
-	if (endsWith(toLowerCase(inputFile), ".dae")) {
+	if (endsWith(toLowerCase(inputFile), ".dae") || endsWith(toLowerCase(inputFile), ".zae")) {
 		convertCollada(inputFile, os, textureDirectory, meshesDirectory);
 	} else if (endsWith(toLowerCase(inputFile), ".obj")) {
 		convertOBJ(inputFile, os, textureDirectory, meshesDirectory);
 	} else {
-		SLog(EError, "Unknown input format (must end in either .DAE or .OBJ)");
+		SLog(EError, "Unknown input format (must end in either .DAE, .ZAE or .OBJ)");
 	}
 
 	if (adjustmentFile != "") {
diff --git a/src/converter/mtsimport.cpp b/src/converter/mtsimport.cpp
index 5473ef03..d59a4af2 100644
--- a/src/converter/mtsimport.cpp
+++ b/src/converter/mtsimport.cpp
@@ -1,7 +1,7 @@
 /**
  * Mitsuba COLLADA 1.4 and Wavefront OBJ -> XML converter
  * 
- * Takes a DAE or OBJ file and turns it into a scene description and separate mesh files
+ * Takes a DAE, ZAE or OBJ file and turns it into a scene description and separate mesh files
  * using a compact binary format. All associated files are copied into newly created 
  * 'textures' and 'meshes' directories
  *
@@ -53,7 +53,7 @@ public:
 
 void help() {
 	cout << "COLLADA 1.4 & Wavefront OBJ Importer, Copyright (c) " MTS_YEAR " Wenzel Jakob" << endl
-		<< "Syntax: mtsimport [options] <DAE/OBJ scene> <XML output file> [Adjustment file]" << endl
+		<< "Syntax: mtsimport [options] <DAE/ZAE/OBJ scene> <XML output file> [Adjustment file]" << endl
 		<< "Options/Arguments:" << endl
 		<<  "   -h          Display this help text" << endl << endl
 		<<  "   -a p1;p2;.. Add one or more entries to the resource search path" << endl << endl
diff --git a/src/qtgui/importdlg.cpp b/src/qtgui/importdlg.cpp
index 41c49a5f..d9796861 100644
--- a/src/qtgui/importdlg.cpp
+++ b/src/qtgui/importdlg.cpp
@@ -35,7 +35,7 @@ void ImportDialog::changeEvent(QEvent *e) {
 
 void ImportDialog::on_inputBrowse_clicked(bool checked) {
 	QFileDialog dialog(this);
-	dialog.setNameFilter(tr("COLLADA 1.4 scenes (*.dae);; Wavefront OBJ scenes (*.obj)"));
+	dialog.setNameFilter(tr("COLLADA 1.4 scenes (*.dae *.zae);; Wavefront OBJ scenes (*.obj)"));
 	dialog.setAcceptMode(QFileDialog::AcceptOpen);
 	dialog.setViewMode(QFileDialog::Detail);
 	dialog.setWindowModality(Qt::ApplicationModal);