diff --git a/Makefile.am b/Makefile.am
index b7aed778e..022430361 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,11 +16,11 @@ distclean-local::
 		-type f -print | xargs $(RM)
 
 install-data-local:
-	instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+	destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
 	done
-	(cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)
 
 ctags:
 	$(RM) $(top_srcdir)/tags
diff --git a/Makefile.in b/Makefile.in
index 732880fcc..c87fbb7cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -661,11 +661,11 @@ distclean-local::
 		-type f -print | xargs $(RM)
 
 install-data-local:
-	instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+	destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
 	done
-	(cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)
 
 ctags:
 	$(RM) $(top_srcdir)/tags
diff --git a/include/Makefile.am b/include/Makefile.am
index d1990dcb0..3388ce8d9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,8 @@ noinst_HEADERS += util/*.h
 noinst_HEADERS += vm/*.h
 
 install-data-local:
-	instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+	destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
 	instfiles=`find . -name '*.h'`; \
         for instfile in $$instfiles; do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
diff --git a/include/Makefile.in b/include/Makefile.in
index 53650a52e..db1587d47 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -388,7 +388,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+	destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
 	instfiles=`find . -name '*.h'`; \
         for instfile in $$instfiles; do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \