diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index c729217..31ffe58 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -1,10 +1,10 @@
 
-nodist_pkgdata_DATA=ikarus.boot
+nodist_pkglib_DATA=ikarus.boot
 EXTRA_DIST=ikarus.boot.orig ikarus.enumerations.ss ikarus.exceptions.ss ikarus.apply.ss ikarus.bytevectors.ss ikarus.cafe.ss ikarus.chars.ss ikarus.code-objects.ss ikarus.codecs.ss ikarus.collect.ss ikarus.command-line.ss ikarus.compiler.altcogen.ss ikarus.compiler.ss ikarus.control.ss ikarus.date-string.ss ikarus.fasl.ss ikarus.fasl.write.ss ikarus.fixnums.ss ikarus.guardians.ss ikarus.handlers.ss ikarus.hash-tables.ss ikarus.intel-assembler.ss ikarus.io-ports.ss ikarus.io-primitives.ss ikarus.io-primitives.unsafe.ss ikarus.io.input-files.ss ikarus.io.input-strings.ss ikarus.io.output-files.ss ikarus.io.output-strings.ss ikarus.lists.ss ikarus.load.ss ikarus.main.ss ikarus.multiple-values.ss ikarus.numerics.ss ikarus.pairs.ss ikarus.posix.ss ikarus.predicates.ss ikarus.pretty-print.ss ikarus.promises.ss ikarus.reader.ss ikarus.records.procedural.ss ikarus.conditions.ss  ikarus.singular-objects.ss ikarus.sort.ss ikarus.strings.ss ikarus.structs.ss ikarus.symbols.ss ikarus.timer.ss ikarus.trace.ss ikarus.transcoders.ss ikarus.unicode-data.ss ikarus.vectors.ss ikarus.writer.ss makefile.ss pass-specify-rep-primops.ss pass-specify-rep.ss psyntax.builders.ss psyntax.compat.ss psyntax.config.ss psyntax.expander.ss psyntax.internal.ss psyntax.library-manager.ss r6rs-records.ss ikarus/code-objects.ss ikarus/compiler.ss ikarus/intel-assembler.ss ikarus/fasl/write.ss unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss
 
-all: $(nodist_pkgdata_DATA)
+all: $(nodist_pkglib_DATA)
 
-CLEANFILES=$(nodist_pkgdata_DATA)
+CLEANFILES=$(nodist_pkglib_DATA)
 
 ikarus.boot: $(EXTRA_DIST) ../src/ikarus
 	../src/ikarus -b ./ikarus.boot.orig --r6rs-script makefile.ss
diff --git a/scheme/Makefile.in b/scheme/Makefile.in
index 9f345e9..11034d8 100644
--- a/scheme/Makefile.in
+++ b/scheme/Makefile.in
@@ -50,9 +50,9 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(nodist_pkgdata_DATA)
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+nodist_pkglibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(nodist_pkglib_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -154,7 +154,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-nodist_pkgdata_DATA = ikarus.boot
+nodist_pkglib_DATA = ikarus.boot
 EXTRA_DIST = ikarus.boot.orig ikarus.enumerations.ss \
 	ikarus.exceptions.ss ikarus.apply.ss ikarus.bytevectors.ss \
 	ikarus.cafe.ss ikarus.chars.ss ikarus.code-objects.ss \
@@ -183,7 +183,7 @@ EXTRA_DIST = ikarus.boot.orig ikarus.enumerations.ss \
 	ikarus/code-objects.ss ikarus/compiler.ss \
 	ikarus/intel-assembler.ss ikarus/fasl/write.ss \
 	unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss
-CLEANFILES = $(nodist_pkgdata_DATA)
+CLEANFILES = $(nodist_pkglib_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -216,22 +216,22 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
+install-nodist_pkglibDATA: $(nodist_pkglib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+	@list='$(nodist_pkglib_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	  echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
 	done
 
-uninstall-nodist_pkgdataDATA:
+uninstall-nodist_pkglibDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+	@list='$(nodist_pkglib_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -270,7 +270,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -316,11 +316,11 @@ info: info-am
 
 info-am:
 
-install-data-am: install-nodist_pkgdataDATA
+install-data-am:
 
 install-dvi: install-dvi-am
 
-install-exec-am:
+install-exec-am: install-nodist_pkglibDATA
 
 install-html: install-html-am
 
@@ -350,7 +350,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-nodist_pkgdataDATA
+uninstall-am: uninstall-nodist_pkglibDATA
 
 .MAKE: install-am install-strip
 
@@ -359,15 +359,15 @@ uninstall-am: uninstall-nodist_pkgdataDATA
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-nodist_pkgdataDATA install-pdf install-pdf-am \
+	install-nodist_pkglibDATA install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-nodist_pkgdataDATA
+	uninstall-nodist_pkglibDATA
 
 
-all: $(nodist_pkgdata_DATA)
+all: $(nodist_pkglib_DATA)
 
 ikarus.boot: $(EXTRA_DIST) ../src/ikarus
 	../src/ikarus -b ./ikarus.boot.orig --r6rs-script makefile.ss
diff --git a/src/Makefile.am b/src/Makefile.am
index e1e423c..4c854c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = ikarus
 ikarus_SOURCES = ikarus-collect.c ikarus-exec.c ikarus-fasl.c ikarus-flonums.c ikarus-main.c ikarus-numerics.c ikarus-print.c ikarus-runtime.c ikarus-symbol-table.c ikarus-verify-integrity.c ikarus-weak-pairs.c ikarus-winmmap.c ikarus-data.h ikarus-winmmap.h ikarus-enter.s
 
-ikarus_CFLAGS=-DBOOTFILE="\"$(pkgdatadir)/ikarus.boot\""
+ikarus_CFLAGS=-DBOOTFILE="\"$(pkglibdir)/ikarus.boot\""
 
 bin_SCRIPTS = scheme-script
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 8d31888..035315d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -176,7 +176,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ikarus_SOURCES = ikarus-collect.c ikarus-exec.c ikarus-fasl.c ikarus-flonums.c ikarus-main.c ikarus-numerics.c ikarus-print.c ikarus-runtime.c ikarus-symbol-table.c ikarus-verify-integrity.c ikarus-weak-pairs.c ikarus-winmmap.c ikarus-data.h ikarus-winmmap.h ikarus-enter.s
-ikarus_CFLAGS = -DBOOTFILE="\"$(pkgdatadir)/ikarus.boot\""
+ikarus_CFLAGS = -DBOOTFILE="\"$(pkglibdir)/ikarus.boot\""
 bin_SCRIPTS = scheme-script
 all: all-am