diff --git a/scripts/checks.m4 b/scripts/checks.m4
index ea7272b7..1efe4bab 100644
--- a/scripts/checks.m4
+++ b/scripts/checks.m4
@@ -77,7 +77,7 @@ AC_DEFUN([TORRENT_WITHOUT_EPOLL], [
 
 AC_DEFUN([TORRENT_WITH_KQUEUE], [
   AC_ARG_WITH(kqueue,
-    [  --with-kqueue                  enable kqueue. [[default=no]]],
+    [  --with-kqueue           enable kqueue. [[default=no]]],
     [
         if test "$withval" = "yes"; then
             AC_DEFINE(USE_KQUEUE, 1, Enable kqueue.)
@@ -354,7 +354,7 @@ AC_DEFUN([TORRENT_WITH_XMLRPC_C], [
         LIBS="$LIBS `xmlrpc-c-config --libs server-util` -lxmlrpc_server"
 
         AC_TRY_LINK(
-        [ #include <xmlrpc_server.h>
+        [ #include <xmlrpc-c/server.h>
         ],[ xmlrpc_registry_new(NULL); ],
         [
           AC_MSG_RESULT(ok)
diff --git a/src/rpc/xmlrpc.cc b/src/rpc/xmlrpc.cc
index 42b7a174..9050cb25 100644
--- a/src/rpc/xmlrpc.cc
+++ b/src/rpc/xmlrpc.cc
@@ -38,8 +38,7 @@
 
 #ifdef HAVE_XMLRPC_C
 #include <stdlib.h>
-#include <xmlrpc.h>
-#include <xmlrpc_server.h>
+#include <xmlrpc-c/server.h>
 #endif
 
 #include <torrent/object.h>