diff --git a/cmake.h.in b/cmake.h.in
index fbeb807d5..1f432f97c 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -51,12 +51,6 @@
 /* Found the GnuTLS library */
 #cmakedefine HAVE_LIBGNUTLS
 
-/* Found the Readline library */
-#cmakedefine HAVE_READLINE
-
-/* Found the pthread library */
-#cmakedefine HAVE_LIBPTHREAD
-
 /* Found tm_gmtoff */
 #cmakedefine HAVE_TM_GMTOFF
 
diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake
deleted file mode 100644
index 8fdaec18f..000000000
--- a/cmake/Modules/FindReadline.cmake
+++ /dev/null
@@ -1,81 +0,0 @@
-# - Find the readline library
-# This module defines
-#  READLINE_INCLUDE_DIR, path to readline/readline.h, etc.
-#  READLINE_LIBRARIES, the libraries required to use READLINE.
-#  READLINE_FOUND, If false, do not try to use READLINE.
-# also defined, but not for general use are
-# READLINE_readline_LIBRARY, where to find the READLINE library.
-# READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined]
-
-# Apple readline does not support readline hooks
-# So we look for another one by default
-IF (APPLE OR FREEBSD)
-  FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
-    /usr/include/
-    /sw/include
-    /opt/local/include
-    /opt/include
-    /usr/local/include
-    NO_DEFAULT_PATH
-    )
-ENDIF (APPLE OR FREEBSD)
-FIND_PATH (READLINE_INCLUDE_DIR NAMES readline/readline.h)
-
-
-# Apple readline does not support readline hooks
-# So we look for another one by default
-IF (APPLE OR FREEBSD)
-  FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline PATHS
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/lib
-    /usr/local/lib
-    NO_DEFAULT_PATH
-    )
-ENDIF (APPLE OR FREEBSD)
-FIND_LIBRARY (READLINE_readline_LIBRARY NAMES readline)
-
-# Sometimes readline really needs ncurses
-IF (APPLE OR FREEBSD)
-  FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses PATHS
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/lib
-    /usr/local/lib
-    /usr/lib
-    NO_DEFAULT_PATH
-    )
-ENDIF (APPLE OR FREEBSD)
-FIND_LIBRARY (READLINE_ncurses_LIBRARY NAMES ncurses)
-
-MARK_AS_ADVANCED (
-  READLINE_INCLUDE_DIR
-  READLINE_readline_LIBRARY
-  READLINE_ncurses_LIBRARY
-  )
-
-SET (READLINE_FOUND "NO" )
-IF (READLINE_INCLUDE_DIR)
-  IF (READLINE_readline_LIBRARY)
-    SET (READLINE_FOUND "YES" )
-    SET (READLINE_LIBRARIES
-      ${READLINE_readline_LIBRARY} 
-      )
-
-    # some readline libraries depend on ncurses
-    IF (READLINE_ncurses_LIBRARY)
-      SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY})
-    ENDIF (READLINE_ncurses_LIBRARY)
-
-  ENDIF (READLINE_readline_LIBRARY)
-ENDIF (READLINE_INCLUDE_DIR)
-
-IF (READLINE_FOUND)
-  MESSAGE (STATUS "Found readline library")
-ELSE (READLINE_FOUND)
-  IF (READLINE_FIND_REQUIRED)
-    MESSAGE (FATAL_ERROR "Could not find readline -- please give some paths to CMake")
-  ENDIF (READLINE_FIND_REQUIRED)
-ENDIF (READLINE_FOUND)
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 0a96c11f0..d14836987 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -162,12 +162,6 @@ int CmdDiagnostics::execute (std::string& output)
 #endif
       << "      CMake: " << CMAKE_VERSION << "\n"
       << "       " << STRING_CMD_DIAG_CAPS << ":"
-#ifdef HAVE_LIBPTHREAD
-      << " +pthreads"
-#else
-      << " -pthreads"
-#endif
-
 #ifdef HAVE_LIBGNUTLS
       << " +tls"
 #else