diff --git a/Makefile b/Makefile
index 2f9e2f79..f9d7e3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ install: chibi-scheme$(EXE)
 	mkdir -p $(DESTDIR)$(BINDIR)
 	cp chibi-scheme$(EXE) $(DESTDIR)$(BINDIR)/
 	mkdir -p $(DESTDIR)$(MODDIR)
-	cp init.scm config.scm $(DESTDIR)$(MODDIR)/
+	cp lib/init.scm lib/config.scm $(DESTDIR)$(MODDIR)/
 	cp -r lib/ $(DESTDIR)$(MODDIR)/
 	mkdir -p $(DESTDIR)$(INCDIR)
 	cp $(INCLUDES) include/chibi/eval.h $(DESTDIR)$(INCDIR)/
diff --git a/config.scm b/lib/config.scm
similarity index 100%
rename from config.scm
rename to lib/config.scm
diff --git a/init.scm b/lib/init.scm
similarity index 100%
rename from init.scm
rename to lib/init.scm
diff --git a/mkfile b/mkfile
index d99032c7..b5b413fc 100644
--- a/mkfile
+++ b/mkfile
@@ -18,7 +18,7 @@ include/chibi/install.h: mkfile
 
 install:V: $BIN/$TARG
 	test -d $MODDIR || mkdir -p $MODDIR
-	cp init.scm $MODDIR/
+	cp -r lib/* $MODDIR/
 
 test:V:
 	./$O.out tests/r5rs-tests.scm