diff --git a/doc/cl65.sgml b/doc/cl65.sgml
index 647b1bdbd..ef7309eec 100644
--- a/doc/cl65.sgml
+++ b/doc/cl65.sgml
@@ -103,7 +103,7 @@ Long options:
   --memory-model model          Set the memory model
   --module                      Link as a module
   --module-id id                Specify a module id for the linker
-  --no-std-lib                  Don't link the standard library
+  --no-target-lib               Don't link the target library
   --o65-model model             Override the o65 model
   --obj file                    Link this object file
   --obj-path path               Specify an object file search path
@@ -186,9 +186,9 @@ There are a few remaining options that control the behaviour of cl65:
   seem to use cc65 to develop for the C64.
 
 
-  <tag><tt>--no-std-lib</tt></tag>
+  <tag><tt>--no-target-lib</tt></tag>
 
-  This option tells the cl65 to not include the standard library into the list
+  This option tells the cl65 to not include the target library into the list
   of libraries.
 
 
diff --git a/src/cl65/main.c b/src/cl65/main.c
index bcb97b148..e61bd02a5 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -138,8 +138,8 @@ static int Module = 0;
 #define MODULE_EXT      ".o65"
 
 /* Name of the target specific runtime library */
-static char* TargetLib  = 0;
-static int   NoStdLib   = 0;
+static char* TargetLib   = 0;
+static int   NoTargetLib = 0;
 
 
 
@@ -497,8 +497,8 @@ static void Link (void)
         CmdAddArg (&LD65, LD65.Files [I]);
     }
 
-    /* Add the standard library if it is not disabled */
-    if (!NoStdLib)
+    /* Add the target library if it is not disabled */
+    if (!NoTargetLib)
     {
         /* Determine which target library is needed */
         SetTargetFiles ();
@@ -816,7 +816,7 @@ static void Usage (void)
             "  --memory-model model\t\tSet the memory model\n"
             "  --module\t\t\tLink as a module\n"
             "  --module-id id\t\tSpecify a module ID for the linker\n"
-            "  --no-std-lib\t\t\tDon't link the standard library\n"
+            "  --no-target-lib\t\tDon't link the target library\n"
             "  --o65-model model\t\tOverride the o65 model\n"
             "  --obj file\t\t\tLink this object file\n"
             "  --obj-path path\t\tSpecify an object file search path\n"
@@ -1172,11 +1172,11 @@ static void OptModuleId (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
-static void OptNoStdLib (const char* Opt attribute ((unused)),
-                         const char* Arg attribute ((unused)))
-/* Disable the standard library */
+static void OptNoTargetLib (const char* Opt attribute ((unused)),
+                            const char* Arg attribute ((unused)))
+/* Disable the target library */
 {
-    NoStdLib = 1;
+    NoTargetLib = 1;
 }
 
 
@@ -1383,7 +1383,7 @@ int main (int argc, char* argv [])
         { "--memory-model",      1, OptMemoryModel    },
         { "--module",            0, OptModule         },
         { "--module-id",         1, OptModuleId       },
-        { "--no-std-lib",        0, OptNoStdLib       },
+        { "--no-target-lib",     0, OptNoTargetLib    },
         { "--o65-model",         1, OptO65Model       },
         { "--obj",               1, OptObj            },
         { "--obj-path",          1, OptObjPath        },