diff --git a/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
index 9badf311..56aad0d2 100644
--- a/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
+++ b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
@@ -96,7 +96,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO
 
 							if(!id.IsImageLoaded) id.LoadImage();
 							Bitmap bmp = id.GetBitmap();
-							bmp.Save(Path.Combine(settings.ObjPath, s + ".PNG"), ImageFormat.Png);
+							bmp.Save(Path.Combine(settings.ObjPath, Path.GetFileNameWithoutExtension(s) + ".PNG"), ImageFormat.Png);
 						} 
 						else 
 						{
@@ -127,7 +127,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.IO
 							if(settings.Textures != null && Array.IndexOf(settings.Textures, s) != -1)
 								flatname += "_FLAT";
 
-							bmp.Save(Path.Combine(settings.ObjPath, flatname + ".PNG"), ImageFormat.Png);
+							bmp.Save(Path.Combine(settings.ObjPath, Path.GetFileNameWithoutExtension(flatname) + ".PNG"), ImageFormat.Png);
 
 						} 
 						else