diff --git a/libguile/load.c b/libguile/load.c
index f034849e6..6894f01bf 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -101,6 +101,17 @@ scm_primitive_load (filename, case_insensitive_p, sharp)
   return SCM_UNSPECIFIED;
 }
 
+
+/* Builtin path to scheme library files. */
+#ifdef SCM_PKGDATA_DIR
+SCM_PROC (s_sys_package_data_dir, "%package-data-dir", 0, 0, 0, scm_sys_package_data_dir);
+SCM
+scm_sys_package_data_dir ()
+{
+  return scm_makfrom0str (SCM_PKGDATA_DIR);
+}
+#endif /* SCM_PKGDATA_DIR */
+
 
 /* Initializing the load path, and searching it.  */
 
@@ -111,16 +122,18 @@ static SCM *scm_loc_load_path;
 static SCM *scm_loc_load_extensions;
 
 /* Initialize the global variable %load-path, given the value of the
-   LIBRARY_PATH preprocessor symbol and the SCHEME_LOAD_PATH
-   environment variable.  */
+   SCM_SITE_DIR and SCM_LIBRARY_DIR preprocessor symbols and the
+   SCHEME_LOAD_PATH environment variable.  */
 void
 scm_init_load_path ()
 {
   SCM path = SCM_EOL;
 
-#ifdef LIBRARY_PATH
-  path = scm_cons (scm_makfrom0str (LIBRARY_PATH), path);
-#endif /* LIBRARY_PATH */
+#ifdef SCM_LIBRARY_DIR
+  path = scm_cons2 (scm_makfrom0str (SCM_SITE_DIR),
+		    scm_makfrom0str (SCM_LIBRARY_DIR),
+		    path);
+#endif /* SCM_LIBRARY_DIR */
   
   {
     char *path_string = getenv ("SCHEME_LOAD_PATH");
diff --git a/libguile/load.h b/libguile/load.h
index ef7cb8836..6d9b453e4 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -48,6 +48,7 @@
 
 extern void scm_init_load_path SCM_P ((void));
 extern SCM scm_primitive_load SCM_P ((SCM filename, SCM casep, SCM sharp));
+extern SCM scm_sys_package_data_dir SCM_P ((void));
 extern SCM scm_sys_search_load_path SCM_P ((SCM filename));
 extern SCM scm_primitive_load_path SCM_P ((SCM filename, SCM casep,
 					   SCM sharp));