diff --git a/remote.c b/remote.c
index b5ecd473fe4ff24a32eb35f66c6bfd3eb3be1292..5168ad474db554c65b3a39a2a124babd93a47a67 100644
--- a/remote.c
+++ b/remote.c
@@ -28,6 +28,10 @@
  * Bugs and commentary to x_cbug@netscape.com.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -564,7 +568,7 @@ usage (void)
 }
 
 
-void
+int
 main (int argc, char **argv)
 {
   Display *dpy;