diff --git a/lang/elisp/Makefile.am b/lang/elisp/Makefile.am
index ffb095f1b..51ebeaf32 100644
--- a/lang/elisp/Makefile.am
+++ b/lang/elisp/Makefile.am
@@ -32,7 +32,7 @@ elisp_sources = \
 	transform.scm \
 	variables.scm
 
-subpkgdatadir = $(pkgdatadir)/$(VERSION)/lang/elisp
+subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp
 subpkgdata_DATA = $(elisp_sources)
 ETAGS_ARGS = $(subpkgdata_DATA)
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 46d1885d0..52911bcc1 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -40,7 +40,7 @@ scripts_sources =		\
 	api-diff		\
 	read-rfc822
 
-subpkgdatadir = $(pkgdatadir)/$(VERSION)/scripts
+subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/scripts
 subpkgdata_SCRIPTS = $(scripts_sources)
 
 EXTRA_DIST = $(scripts_sources)