3 files changed, 48 insertions, 0 deletions
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index 15430f6d..c62d2d7f 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -7,6 +7,53 @@
 
 	<key>CFBundleIdentifier</key>
 	<string>org.idrix.VeraCrypt</string>
+	
+ 	<key>UTExportedTypeDeclarations</key>
+    <array>
+    	<dict>
+			<key>UTTypeIdentifier</key>
+			<string>org.idrix.veracrypt.hc</string>
+            
+            <key>UTTypeDescription</key>
+            <string>VeraCrypt Container File</string>
+            
+            <key>UTTypeConformsTo</key>
+            <array>
+            	<string>public.data</string>
+        	</array>
+                
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>hc</string>
+                    <string>tc</string>
+                </array>
+                    
+                <key>public.mime-type</key>
+                <string>application/veracrypt</string>
+            </dict>
+            </dict>
+        </array>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+    	<dict>
+     	   <key>CFBundleTypeIconFile</key>
+     	   <string>VeraCrypt_Volume.icns</string>
+    	    <key>CFBundleTypeName</key>
+        	<string>VeraCrypt Container File</string>
+	        <key>CFBundleTypeRole</key>
+    	    <string>Viewer</string>
+        	<key>LSHandlerRank</key>
+        	<string>Owner</string>
+        	<key>LSItemContentTypes</key>
+        	<array>
+            	<!-- my app supports files with my custom extension (see UTExportedTypeDeclarations) -->
+            	<string>org.idrix.veracrypt.hc</string>
+        	</array>
+    	</dict>
+	</array>
 
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
diff --git a/src/Main/Main.make b/src/Main/Main.make
index 92865ef3..db04eee3 100644
--- a/src/Main/Main.make
+++ b/src/Main/Main.make
@@ -173,6 +173,7 @@ endif
 endif
 
 	cp $(PWD)/Resources/Icons/VeraCrypt.icns $(APPNAME).app/Contents/Resources
+	cp $(PWD)/Resources/Icons/VeraCrypt_Volume.icns $(APPNAME).app/Contents/Resources
 	cp "$(PWD)/Release/Setup Files/VeraCrypt User Guide.pdf" $(APPNAME).app/Contents/Resources
 
 	echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo
diff --git a/src/Resources/Icons/VeraCrypt_Volume.icns b/src/Resources/Icons/VeraCrypt_Volume.icns
new file mode 100644
index 00000000..808243fe
--- /dev/null
+++ b/src/Resources/Icons/VeraCrypt_Volume.icns