diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index 8c9dc213be7..09e953c4174 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -452,6 +452,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 				<string>tex</string>
 				<string>ltx</string>
 				<string>ctx</string>
+				<string>dtx</string>
+				<string>sty</string>
 				<string>latex</string>
 				<string>texi</string>
 			</array>
@@ -462,6 +464,30 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>org</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Org document</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>json</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>JSON document</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -478,6 +504,68 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 		</dict>
 	</array>
 
+	<!-- Export definitions so that OS X understands about the file types -->
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.source-code</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Emacs Lisp Source File</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.gnu.emacs-lisp</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.gnu.org/software/emacs/manual/html_node/elisp/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>el</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.content</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Emacs Lisp Object File</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.gnu.emacs-lisp-object</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.gnu.org/software/emacs/manual/html_node/elisp/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>elc</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.plain-text</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Org document</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.orgmode.org</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://orgmode.org</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>org</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
+
 	<key>NSServices</key>
 	<array>
 		<dict>