diff --git a/daemon/daemon.c b/daemon/daemon.c
index 2583aa6ea..884cf4cf0 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -101,8 +101,7 @@ main( int argc, char ** argv )
     server_debug( debug );
     server_listen( sockfd );
 
-    event_dispatch();
-    /* XXX event_base_dispatch( evbase ); */
+    event_base_dispatch( evbase );
 
     return 1;
 }
@@ -312,22 +311,22 @@ exitcleanup( void )
 }
 
 void
-setupsigs( struct event_base * base /* XXX */ UNUSED )
+setupsigs( struct event_base * base )
 {
     static struct event ev_int;
     static struct event ev_quit;
     static struct event ev_term;
 
     signal_set( &ev_int, SIGINT, gotsig, NULL );
-    /* XXX event_base_set( base, &ev_int ); */
+    event_base_set( base, &ev_int );
     signal_add( &ev_int, NULL );
 
     signal_set( &ev_quit, SIGQUIT, gotsig, NULL );
-    /* XXX event_base_set( base, &ev_quit ); */
+    event_base_set( base, &ev_quit );
     signal_add( &ev_quit, NULL );
 
     signal_set( &ev_term, SIGTERM, gotsig, NULL );
-    /* XXX event_base_set( base, &ev_term ); */
+    event_base_set( base, &ev_term );
     signal_add( &ev_term, NULL );
 
     signal( SIGPIPE, SIG_IGN );
diff --git a/daemon/server.c b/daemon/server.c
index 9b90c14a8..f323aa102 100644
--- a/daemon/server.c
+++ b/daemon/server.c
@@ -179,7 +179,7 @@ server_listen( int fd )
     }
 
     event_set( ev, fd, EV_READ | EV_PERSIST, newclient, ev );
-    /* XXX event_base_set( gl_base, ev ); */
+    event_base_set( gl_base, ev );
     event_add( ev, NULL );
 
     return 0;
@@ -242,7 +242,7 @@ newclient( int fd, short event UNUSED, void * arg )
             free( client );
             return;
         }
-        /* XXX bufferevent_base_set( gl_base, clev ); */
+        bufferevent_base_set( gl_base, clev );
         bufferevent_settimeout( clev, CLIENT_TIMEOUT, CLIENT_TIMEOUT );
 
         client->fd      = clfd;