diff --git a/Makefile.am b/Makefile.am
index e5ae47a..b05fff6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,15 @@ thisinclude_HEADERS = \
 	include/rs_vand/rs_galois.h \
 	include/rs_vand/liberasurecode_rs_vand.h
 
+install-exec-hook:
+	-(cd $(DESTDIR)$(includedir) && \
+	   rm erasurecode.h erasurecode_version.h \
+	      erasurecode_stdinc.h config_liberasurecode.h && \
+	   $(LN_S) liberasurecode/erasurecode.h && \
+	   $(LN_S) liberasurecode/erasurecode_version.h && \
+	   $(LN_S) liberasurecode/erasurecode_stdinc.h && \
+	   $(LN_S) liberasurecode/config_liberasurecode.h)
+
 test: check
 	$(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so'))
 	$(eval SODIRS := $(dir $(SONAMES)))
diff --git a/configure.ac b/configure.ac
index ab9769c..9b10284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AM_MAINTAINER_MODE([disable])
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
 AM_SILENT_RULES([yes])
 
+AC_PROG_LN_S
+
 dnl Compiling with per-target flags requires AM_PROG_CC_C_O.
 AC_PROG_CC
 AM_PROG_CC_C_O