diff --git a/Makefile.in b/Makefile.in
index 0dfd0b61eda..ea31ba29186 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -280,10 +280,12 @@ install_lib: dummy
 	    if [ $(LIB_TARGET) = libwine.so.1.0 ]; then $(LDCONFIG); fi \
 	fi
 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
+	$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
 	$(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
 
 uninstall_lib: dummy
-	cd $(libdir); $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym
+	cd $(libdir) && $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym
+	$(RM) $(bindir)/wineserver $(bindir)/wineclipsrv
 
 $(X11OBJS) $(EMUOBJS) $(LIBOBJS): $(TOOLSUBDIRS) dummy
 	@cd `dirname $@`; $(SUBMAKE)
diff --git a/scheduler/Makefile.in b/scheduler/Makefile.in
index 528244465d4..e969ff0f468 100644
--- a/scheduler/Makefile.in
+++ b/scheduler/Makefile.in
@@ -1,4 +1,4 @@
-DEFS      = @DLLFLAGS@ -D__WINE__
+DEFS      = @DLLFLAGS@ -D__WINE__ -DBINDIR="\"$(bindir)\""
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@
diff --git a/scheduler/client.c b/scheduler/client.c
index 9f227397610..128bb8cd763 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -289,12 +289,9 @@ int CLIENT_InitServer(void)
     default:  /* parent */
         close( fd[0] );
         sprintf( buffer, "%d", fd[1] );
-/*#define EXEC_SERVER*/
-#ifdef EXEC_SERVER
+        execl( BINDIR "/wineserver", "wineserver", buffer, NULL );
         execlp( "wineserver", "wineserver", buffer, NULL );
-        execl( "/usr/local/bin/wineserver", "wineserver", buffer, NULL );
         execl( "./server/wineserver", "wineserver", buffer, NULL );
-#endif
         create_initial_thread( fd[1] );
         exit(0);
     }
diff --git a/server/main.c b/server/main.c
index 0275b6d76b8..c582f2eb846 100644
--- a/server/main.c
+++ b/server/main.c
@@ -23,7 +23,7 @@ int main( int argc, char *argv[] )
     /* make sure the fd is valid */
     if (fcntl( fd, F_GETFL, 0 ) == -1) goto error;
 
-    debug_level = 1;
+/*    debug_level = 1; */
 
     if (debug_level) fprintf( stderr, "Server: starting (pid=%ld)\n", (long) getpid() );
     create_initial_thread( fd );