diff --git a/ChangeLog b/ChangeLog
index e978451c..faf92d9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,8 @@ CVS code -
 	  newline. (DLR)
 	- Don't treat the return value of strn?(case)?cmp() as boolean.
 	  (DLR and David Benbennick)
+	- Automatically install a symlink "rnano" pointing to nano.
+	  Changes to src/Marefile.am. (DLR)
 - files.c:
   close_open_file()
 	- Tweak to no longer rely on the return values of
@@ -196,6 +198,9 @@ CVS code -
 	  value can't be larger than COLS. (DLR)
 	- Allow the user to exit the help browser via Ctrl-C as well as
 	  Ctrl-X, for consistency with the file browser. (DLR)
+- configure.ac:
+	- Add AC_PROG_LN_S, so that we can portably create symlinks.
+	  (DLR)
 - nanorc.sample:
 	- Add sample regexes for patch files. (Mike Frysinger)
 	- Various improvements to the "c-file" regexes.  Add double,
diff --git a/configure.ac b/configure.ac
index d5633249..196c4feb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_PREREQ(2.54)
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
+AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 04515409..e6567111 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,3 +19,6 @@ nano_SOURCES =	color.c \
 		winio.c 
 
 nano_LDADD = @GLIB_LIBS@ @LIBINTL@
+
+install-exec-hook:
+	cd $(DESTDIR)$(bindir) && $(LN_S) nano rnano