--- wine-cvs/server/Makefile.in	Fri Sep 14 08:28:30 2001
+++ wine/server/Makefile.in	Sat Jul 20 10:07:05 2002
@@ -1,4 +1,5 @@
-DEFS      = -D__WINE__
+sysconfdir = @sysconfdir@
+DEFS      = -D__WINE__ -DETCDIR="\"$(sysconfdir)\""
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@
--- wine-cvs/server/registry.c	Wed Jan  2 10:39:40 2002
+++ wine/server/registry.c	Sat Jul 20 10:07:05 2002
@@ -1355,6 +1355,26 @@
     if (!(filename = malloc( strlen(config) + 8 ))) fatal_error( "out of memory\n" );
     strcpy( filename, config );
     strcat( filename, "/config" );
+
+    {
+        /*
+         *  If the registry doesn't exist, copy the global one
+         */
+        if( access( filename, R_OK ) && !access( ETCDIR"/config", R_OK )) {
+            FILE *in, *out;
+	    char buf[1024];
+            if( !(in = fopen( ETCDIR"/config", "r" )))
+                return;
+            if( !(out = fopen( filename, "w" ))) {
+                fclose( in);
+                return;
+	    }
+	    while( fgets( buf, 1024, in)) fputs(buf, out);
+            fclose( in);
+	    fclose( out);
+        }
+    }
+
     if ((f = fopen( filename, "r" )))
     {
         struct key *key;