diff --git a/ChangeLog b/ChangeLog
index 674c5c969..2f089b2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-23  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSBundle.m:
+	Fixe to resolve links and standardize path to current executable.
+
 2011-05-22  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSMime.m:
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index ef30d98b1..60dd12701 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -287,7 +287,11 @@ GSPrivateExecutablePath()
 	    {
 	      executablePath = AbsolutePathOfExecutable(executablePath, YES);
 	    }
-
+	  else
+	    {
+	      executablePath = [executablePath stringByResolvingSymlinksInPath];
+	      executablePath = [executablePath stringByStandardizingPath];
+	    }
 	  IF_NO_GC([executablePath retain];)
 	  beenHere = YES;
 	}