--- rxvt-unicode/src/rxvtd.C	2010/10/24 17:34:47	1.51
+++ rxvt-unicode/src/rxvtd.C	2010/12/12 19:30:10	1.55
@@ -102,7 +102,7 @@
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
 
-  unlink (rxvt_connection::unix_sockname ());
+  unlink (sockname);
 
   mode_t omask = umask (0077);
 
@@ -227,13 +227,13 @@
 int
 main (int argc, const char *const *argv)
 {
-  int opt_fork, opt_opendisplay, opt_quiet;
+  ptytty::init ();
+
+  static char opt_fork, opt_opendisplay, opt_quiet;
 #if ENABLE_MLOCK
-  int opt_lock;
+  static char opt_lock;
 #endif
 
-  rxvt_init ();
-
   for (int i = 1; i < argc; i++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
@@ -253,6 +253,8 @@
         }
     }
 
+  rxvt_init ();
+
   // optionally open display and never release it.
   if (opt_opendisplay)
     if (const char *dpy = getenv ("DISPLAY"))