diff --git a/src/options.c b/src/options.c
index 2e19c32..8015c70 100644
--- a/src/options.c
+++ b/src/options.c
@@ -208,9 +208,6 @@ static struct opt_entry opt_list[] = {
 #define JOHN_USAGE_INDENT \
 "                         " // formats are prepended with a space
 
-#define JOHN_USAGE_TAIL \
-"--list=WHAT               list capabilities, see --list=help or doc/OPTIONS\n"
-
 #if defined(HAVE_OPENCL) && defined(HAVE_CUDA)
 #define JOHN_USAGE_GPU \
 "--platform=N              set OpenCL platform (list using --list=opencl-devices)\n" \
@@ -224,6 +221,10 @@ static struct opt_entry opt_list[] = {
 "--device=N                set CUDA device (list using --list=cuda-devices)\n"
 #endif
 
+#define JOHN_USAGE_TAIL \
+"--list=WHAT               list capabilities, see --list=help or doc/OPTIONS,\n" \
+"                          see --list=hidden-options for even more john options\n"
+
 static int qcmpstr(const void *p1, const void *p2)
 {
 	return strcmp(*(const char**)p1, *(const char**)p2);
@@ -275,11 +276,11 @@ static void print_usage(char *name)
 	} while (formats_list[i]);
 	MEM_FREE(formats_list);
 
-	printf("%s", JOHN_USAGE_TAIL);
-
-#if defined(HAVE_OPENCL) || defined(HAVE_CUDA)
+#if defined(JOHN_USAGE_GPU)
 	printf("%s", JOHN_USAGE_GPU);
 #endif
+	printf("%s", JOHN_USAGE_TAIL);
+
 	exit(0);
 }