diff --git a/ipmitool/lib/ipmi_main.c b/ipmitool/lib/ipmi_main.c
index f5a0ebc..682af7b 100644
--- a/ipmitool/lib/ipmi_main.c
+++ b/ipmitool/lib/ipmi_main.c
@@ -76,7 +76,7 @@
 #ifdef ENABLE_ALL_OPTIONS
 # define OPTION_STRING	"I:hVvcgsEao:H:P:f:U:p:C:L:A:t:m:S:"
 #else
-# define OPTION_STRING	"I:hVvcH:f:U:p:"
+# define OPTION_STRING	"I:hVvcH:f:U:p:S:"
 #endif
 
 extern int verbose;
@@ -224,6 +224,7 @@ ipmi_option_usage(const char * progname, struct ipmi_cmd * cmdlist, struct ipmi_
 	lprintf(LOG_NOTICE, "       -p port        Remote RMCP port [default=623]");
 	lprintf(LOG_NOTICE, "       -U username    Remote session username");
 	lprintf(LOG_NOTICE, "       -f file        Read remote session password from file");
+	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
 #ifdef ENABLE_ALL_OPTIONS
 	lprintf(LOG_NOTICE, "       -a             Prompt for remote password");
 	lprintf(LOG_NOTICE, "       -C ciphersuite Cipher suite to be used by lanplus interface");
@@ -234,7 +235,6 @@ ipmi_option_usage(const char * progname, struct ipmi_cmd * cmdlist, struct ipmi_
 	lprintf(LOG_NOTICE, "       -m address     Set local IPMB address");
 	lprintf(LOG_NOTICE, "       -t address     Bridge request to remote target address");
 	lprintf(LOG_NOTICE, "       -o oemtype     Setup for OEM (use 'list' to see available OEM types)");
-	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
 #endif
 	lprintf(LOG_NOTICE, "");
 
@@ -366,7 +366,6 @@ ipmi_main(int argc, char ** argv,
 				goto out_free;
 			}
 			break;
-#ifdef ENABLE_ALL_OPTIONS
 		case 'S':
 			sdrcache = strdup(optarg);
 			if (sdrcache == NULL) {
@@ -374,6 +373,7 @@ ipmi_main(int argc, char ** argv,
 				goto out_free;
 			}
 			break;
+#ifdef ENABLE_ALL_OPTIONS
 		case 'o':
 			oemtype = strdup(optarg);
 			if (oemtype == NULL) {