Index: src/w32.c
===================================================================
--- src/w32.c	(revision 3619)
+++ src/w32.c	(working copy)
@@ -984,7 +984,7 @@
       {"HOME", "C:/"},
       {"PRELOAD_WINSOCK", NULL},
       {"emacs_dir", "C:/emacs"},
-      {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
+      {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/packages/lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
       {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
       {"EMACSDATA", "%emacs_dir%/etc"},
       {"EMACSPATH", "%emacs_dir%/bin"},
Index: nt/gmake.meadow.defs
===================================================================
--- nt/gmake.meadow.defs	(revision 3619)
+++ nt/gmake.meadow.defs	(working copy)
@@ -108,7 +108,8 @@
 INSTALL_DIR     = c:/Meadow
 endif
 
-INSTALL_DIR_M   = $(shell cygpath -u $(INSTALL_DIR)/$(MEADOW_VERSION))
+# INSTALL_DIR_M   = $(shell cygpath -u $(INSTALL_DIR)/$(MEADOW_VERSION))
+INSTALL_DIR_M   = $(shell cygpath -u $(INSTALL_DIR))
 INSTALL_DIR_M_DOS = $(shell cygpath -w $(INSTALL_DIR_M))
 INSTALL_DIR_DOS = $(shell cygpath -w $(INSTALL_DIR))
 
Index: nt/install.c
===================================================================
--- nt/install.c	(revision 3619)
+++ nt/install.c	(working copy)
@@ -327,8 +327,13 @@
     strcpy(main_top_root, main_root);
 
   hkey = create_key(HKEY_LOCAL_MACHINE, tmpstr);
+#if 0
   sprintf(buffer, "%ssite-lisp;%ssite-lisp;%slisp;%sleim",
 	  main_root, main_top_root, main_root, main_root);
+#else
+  sprintf(buffer, "%ssite-lisp;%spackages\\lisp;%slisp;%sleim",
+	  main_root, main_root, main_root, main_root);
+#endif
   set_value(hkey,      "EMACSLOADPATH", buffer);
   set_value_path(hkey, "EMACSDATA",     main_root, "etc");
   set_value_path(hkey, "EMACSPATH",     main_root, "bin");