diff --git a/CHANGES b/CHANGES
index 5d588dedd..4f77adba0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
 
 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745, STR #942, STR #931)
+	- The fltk-config script now handles invocation via a
+	  symlink (STR #869)
 	- Updated WIN32 cut/paste code to consistently handle DOS
 	  text (STR #961)
 	- Added shared library support for Cygwin and MingW (STR
diff --git a/fltk-config.in b/fltk-config.in
index f87d5e93d..92aa6760f 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -35,8 +35,13 @@ VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
 APIVERSION="$MAJOR_VERSION.$MINOR_VERSION"
 
 ### BEGIN fltk-config
+symlink=`readlink $0`
+if test -n "$symlink"; then
+	selfdir=`dirname $symlink`
+else
+	selfdif=`dirname $0`
+fi
 
-selfdir=`dirname $0`
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no