diff --git a/lib/master.pike.in b/lib/master.pike.in
index c1a221913424d0bf973cca588f129ffb3a7db785..b6e1a6be56b849b97822ad309e93874a24d6a086 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,4 +1,4 @@
-/* $Id: master.pike.in,v 1.27 1998/05/11 23:25:21 mast Exp $
+/* $Id: master.pike.in,v 1.28 1998/05/13 07:36:56 hubbe Exp $
  * 
  * Master-file for Pike.
  *
@@ -556,6 +556,22 @@ void _main(string *orig_argv, string *env)
 
   foreach(env,a) if(sscanf(a,"%s=%s",a,b)) environment[a]=b;
 
+#ifdef __NT__
+  function rget=lambda(string ent) {
+   return
+     RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ||
+     RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ;
+ };
+  string tmp=rget("share_prefix");
+  // add path for architecture-shared files
+  add_include_path(tmp+"/include");
+  add_module_path(tmp+"/modules");
+
+  string tmp=rget("lib_prefix");
+  // add path for architecture-dependant files
+  add_include_path(tmp+"/include");
+  add_module_path(tmp+"/modules");
+#else
   // add path for architecture-shared files
   add_include_path("�share_prefix�/include");
   add_module_path("�share_prefix�/modules");
@@ -563,6 +579,7 @@ void _main(string *orig_argv, string *env)
   // add path for architecture-dependant files
   add_include_path("�lib_prefix�/include");
   add_module_path("�lib_prefix�/modules");
+#endif
 
   q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""});
   for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]);
@@ -735,7 +752,6 @@ void _main(string *orig_argv, string *env)
 
   if(trace) predef::trace(trace);
   i=script->main(sizeof(argv),argv,env);
-  predef::trace(0);
   if(i >=0) exit(i);
 }