diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index 267e292..31c4501 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -904,6 +904,9 @@ int slbt_exec_link(
 	if (dctx->cctx->drvflags & SLBT_DRIVER_ALL_STATIC) {
 		fstaticonly = true;
 		fpic        = false;
+	} else if (dctx->cctx->drvflags & SLBT_DRIVER_DISABLE_SHARED) {
+		fstaticonly = true;
+		fpic        = false;
 	} else if (dctx->cctx->drvflags & SLBT_DRIVER_SHARED) {
 		fstaticonly = false;
 		fpic        = true;
diff --git a/src/skin/slbt_skin_default.c b/src/skin/slbt_skin_default.c
index 2b74632..88c38dd 100644
--- a/src/skin/slbt_skin_default.c
+++ b/src/skin/slbt_skin_default.c
@@ -137,8 +137,7 @@ const struct argv_option slbt_default_options[] = {
 				ARGV_OPTION_HYBRID_ONLY,0,0,
 				"for libraries, only create an archive "
 				"containing the individual object files, and "
-				"accordingly do not create a shared library. "
-				"[currently a no-op]"},
+				"accordingly do not create a shared library"},
 
 	{"avoid-version",	0,TAG_AVOID_VERSION,ARGV_OPTARG_NONE,
 				ARGV_OPTION_HYBRID_ONLY,0,0,