diff --git a/DATFromDir/DATFromDir.cs b/DATFromDir/DATFromDir.cs
index 85f166b9..0c760aad 100644
--- a/DATFromDir/DATFromDir.cs
+++ b/DATFromDir/DATFromDir.cs
@@ -54,6 +54,8 @@ namespace SabreTools
 			_logger = new Logger(false, "datfromdir.log");
 			_logger.Start();
 
+			Remapping.CreateArchiveFormats();
+
 			// First things first, take care of all of the arguments that this could have
 			_noMD5 = false; _noSHA1 = false; _forceunzip = false; _allfiles = false; _old = false;
 			_name = ""; _desc = ""; _cat = ""; _version = ""; _author = "";
@@ -289,7 +291,7 @@ namespace SabreTools
 			DirectoryInfo di = Directory.CreateDirectory(_tempDir);
 
 			bool encounteredErrors = true;
-			if (!_allfiles)
+			if (!_allfiles && Remapping.ArchiveFormats.Contains(Path.GetExtension(item).ToLowerInvariant()))
 			{
 				try
 				{
diff --git a/SabreHelper/Remapping.cs b/SabreHelper/Remapping.cs
index a65256dd..880a41ad 100644
--- a/SabreHelper/Remapping.cs
+++ b/SabreHelper/Remapping.cs
@@ -28,6 +28,9 @@ namespace SabreTools.Helper
 		public static Dictionary<string, int> PCE = new Dictionary<string, int>();
 		public static Dictionary<string, int> SNES = new Dictionary<string, int>();
 
+		// Available archive formats
+		public static List<string> ArchiveFormats = new List<string>();
+
 		/// <summary>
 		/// Create all remappings to be used by the program
 		/// </summary>
@@ -226,5 +229,12 @@ namespace SabreTools.Helper
 				}
 			}
 		}
+
+		public static void CreateArchiveFormats()
+		{
+			ArchiveFormats.Add("7z");
+			ArchiveFormats.Add("zip");
+			ArchiveFormats.Add("rar");
+		}
 	}
 }