diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index a38cbc235726c67d6cea28a75daaec7a820e574e..80a3c864e63b0c2fc9b06c1a9028a83dc11f9f2c 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -27,10 +27,6 @@
 /* use our own printf() functions */
 #include "curlx.h"
 
-#ifdef USE_MANUAL
-#  include "tool_hugehelp.h"
-#endif
-
 #include "tool_binmode.h"
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
@@ -1465,8 +1461,7 @@ ParameterError getparameter(char *flag,    /* f or -long-flag */
     case 'M': /* M for manual, huge help */
       if(toggle) { /* --no-manual shows no manual... */
 #ifdef USE_MANUAL
-        hugehelp();
-        return PARAM_HELP_REQUESTED;
+        return PARAM_MANUAL_REQUESTED;
 #else
         warnf(config,
               "built-in manual was disabled at build-time!\n");
@@ -1864,6 +1859,7 @@ ParameterError parse_args(struct Configurable *config, int argc,
   }
 
   if(result && result != PARAM_HELP_REQUESTED &&
+     result != PARAM_MANUAL_REQUESTED &&
      result != PARAM_VERSION_INFO_REQUESTED &&
      result != PARAM_ENGINES_REQUESTED) {
     const char *reason = param2text(result);
diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index ac55d0b18a123afe934eb9d2bb69aacfa242b674..fee790b1348e5b0834e229bc0180a981f6e39b33 100644
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -30,6 +30,7 @@ typedef enum {
   PARAM_REQUIRES_PARAMETER,
   PARAM_BAD_USE,
   PARAM_HELP_REQUESTED,
+  PARAM_MANUAL_REQUESTED,
   PARAM_VERSION_INFO_REQUESTED,
   PARAM_ENGINES_REQUESTED,
   PARAM_GOT_EXTRA_PARAMETER,
diff --git a/src/tool_hugehelp.h b/src/tool_hugehelp.h
index 28d44dfde69c67ac97b8eeddf9b895488c36df25..a7ae784e451fe62c7afdbcaf16bde167823d0aa7 100644
--- a/src/tool_hugehelp.h
+++ b/src/tool_hugehelp.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -23,6 +23,10 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
+#ifdef USE_MANUAL
 void hugehelp(void);
+#else
+#define hugehelp() Curl_nop_stmt
+#endif
 
 #endif /* HEADER_CURL_TOOL_HUGEHELP_H */
diff --git a/src/tool_operate.c b/src/tool_operate.c
index bf10b8111dda714a796459b74864abd7fd4c28a9..8350c1df94643f5642d98847770e7d73f650cc41 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -80,6 +80,7 @@
 #include "tool_xattr.h"
 #include "tool_vms.h"
 #include "tool_help.h"
+#include "tool_hugehelp.h"
 
 #include "memdebug.h" /* keep this as LAST include */
 
@@ -1828,8 +1829,11 @@ CURLcode operate(struct Configurable *config, int argc, argv_item_t argv[])
     if(res) {
       result = CURLE_OK;
 
+      /* Check if we were asked for the manual */
+      if(res == PARAM_MANUAL_REQUESTED)
+        hugehelp();
       /* Check if we were asked for the version information */
-      if(res == PARAM_VERSION_INFO_REQUESTED)
+      else if(res == PARAM_VERSION_INFO_REQUESTED)
         tool_version_info();
       /* Check if we were asked to list the SSL engines */
       if(res == PARAM_ENGINES_REQUESTED)
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 9115a05ddc1e94961af2dd1b205799b19803d440..ca3a4515ef1576434f3b97c207716c08bd9e39ca 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -231,6 +231,7 @@ int parseconfig(const char *filename,
           filename = (char *)"<stdin>";
         }
         if(res != PARAM_HELP_REQUESTED &&
+           res != PARAM_MANUAL_REQUESTED &&
            res != PARAM_VERSION_INFO_REQUESTED &&
            res != PARAM_ENGINES_REQUESTED) {
           const char *reason = param2text(res);