diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2a8931a1b9..ac18233ab9 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -5333,6 +5333,7 @@ fname_case		Case in file names matters (for Amiga, MS-DOS, and
 folding			Compiled with |folding| support.
 footer			Compiled with GUI footer support. |gui-footer|
 fork			Compiled to use fork()/exec() instead of system().
+fullscreen              Compiled with 'fullscreen' support.
 gettext			Compiled with message translation |multi-lang|
 gui			Compiled with GUI enabled.
 gui_athena		Compiled with Athena GUI.
@@ -5377,6 +5378,7 @@ multi_lang		Compiled with support for multiple languages.
 mzscheme		Compiled with MzScheme interface |mzscheme|.
 netbeans_intg		Compiled with support for |netbeans|.
 netbeans_enabled	Compiled with support for |netbeans| and it's used.
+odbeditor               Compiled with |odbeditor| support.
 ole			Compiled with OLE automation support for Win32.
 os2			OS/2 version of Vim.
 osfiletype		Compiled with support for osfiletypes |+osfiletype|
@@ -5418,6 +5420,7 @@ tgetent			Compiled with tgetent support, able to use a termcap
 			or terminfo file.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
+transparency            Compiled with 'transparency' support.
 unix			Unix version of Vim.
 user_commands		User-defined commands.
 viminfo			Compiled with viminfo support.
diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt
index 59c62be5a5..df6c9b5fc9 100644
--- a/runtime/doc/gui_mac.txt
+++ b/runtime/doc/gui_mac.txt
@@ -168,6 +168,18 @@ command:
 	:gui [++opt] [+cmd] [-f|-b] [files...]
 Note: Forking ("-b") currently does not work.
 
+						*odbeditor* *external-editor*
+MacVim can act as an 'external editor' for Mac OS X applications that support
+the ODB Editor Protocol (or the 'external editor' protocol).  Each application
+has different ways of configuring this option, check the applications
+documentation.  Once configured properly MacVim can be used to open files in
+such an application.
+
+A technical note: MacVim handles file open, modified and closed events.  In
+the open event the FTok and Burl parameters are parsed (the latter is ignored
+at the moment though).  In the modified and closed events the Tokn parameter
+is sent back to the server application.
+
 ==============================================================================
 3. Special colors					*macvim-colors*
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index d5ce26471e..b9c70bb560 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -315,6 +315,7 @@ N  *+find_in_path*	include file searches: |[I|, |:isearch|,
 N  *+folding*		|folding|
    *+footer*		|gui-footer|
    *+fork*		Unix only: |fork| shell commands
+m  *+fullscreen*        MacVim only: edit in full-screen
 N  *+gettext*		message translations |multi-lang|
    *+GUI_Athena*	Unix only: Athena |GUI|
    *+GUI_neXtaw*	Unix only: neXtaw |GUI|
@@ -350,6 +351,7 @@ N  *+multi_lang*	non-English language support |multi-lang|
 m  *+mzscheme*		Mzscheme interface |mzscheme|
 m  *+mzscheme/dyn*	Mzscheme interface |mzscheme-dynamic| |/dyn|
 m  *+netbeans_intg*	|netbeans|
+m  *+odbeditor*         MacVim only: ODB Editor Protocol support |odbeditor|
 m  *+ole*		Win32 GUI only: |ole-interface|
    *+osfiletype*	Support for the 'osfiletype' option and filetype
 			checking in automatic commands.  |autocmd-osfiletypes|
@@ -386,6 +388,7 @@ N  *+textobjects*	|text-objects| selection
    *+tgetent*		non-Unix only: able to use external termcap
 N  *+title*		Setting the window 'title' and 'icon'
 N  *+toolbar*		|gui-toolbar|
+m  *+transparency*      MacVim only: window background transparency
 N  *+user_commands*	User-defined commands. |user-commands|
 N  *+viminfo*		|'viminfo'|
 N  *+vertsplit*		Vertically split windows |:vsplit|
diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index 99cfcf0822..1d24daeb97 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -531,7 +531,7 @@
 	<key>CFBundleIconFile</key>
 	<string>vim_gloss</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.vim.MacVim-odb</string>
+	<string>org.vim.MacVim</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
index b5675b0056..df440005f7 100644
--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
@@ -204,7 +204,7 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */