diff --git a/Makefile.am b/Makefile.am
index ba0b7fba..24611c9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,11 @@ install-data-hook: uninstall-hook
 	$(MKDIR) $(DESTDIR)$(DATADIR)
 	cp -prf espeak-data/* $(DESTDIR)$(DATADIR)
 
+install-exec-hook:
+	cd $(DESTDIR)$(BINDIR) && rm -f espeak && $(LN_S) espeak-ng espeak
+	cd $(DESTDIR)$(BINDIR) && rm -f speak  && $(LN_S) speak-ng speak
+	cd $(DESTDIR)$(LIBDIR) && rm -f libespeak.la && $(LN_S) libespeak-ng.la libespeak.la
+
 clean-local:
 	cd src && rm -f *.o *~ && cd ..
 
diff --git a/configure.ac b/configure.ac
index 8df45b73..08ecfa15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ dnl ================================================================
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_PROG_LN_S
 
 dnl ================================================================
 dnl C99 compiler checks.