diff --git a/doc/aa-enable.pod b/doc/aa-enable.pod
index 8fec95d..c7d7538 100644
--- a/doc/aa-enable.pod
+++ b/doc/aa-enable.pod
@@ -6,7 +6,7 @@ aa-enable - Enable services, i.e. copy servicedirs to repodir
 
 B<aa-enable> [B<-D>] [B<-r> I<REPODIR>] [B<-c> I<CRASH>] [B<-f> I<FINISH>]
 [B<-k> I<SERVICE>] [B<-S> I<SOURCEDIR>] [B<-s> I<SOURCEDIR>] [B<-l> I<LISTDIR>]
-[B<-n>] [B<-w>] [I<SERVICE...>]
+[B<-N>] [B<-W>] [I<SERVICE...>]
 
 =head1 OPTIONS
 
@@ -53,7 +53,7 @@ into the servicedir; See below for more.
 If I<LISTDIR> doesn't start with a slash or dot, it will be prefixed with
 I</etc/anopa/listdirs/>
 
-=item B<-n, --no-needs>
+=item B<-N, --no-needs>
 
 Don't auto-enable any services listed under directory I<needs> of a service
 being (auto-)enabled.
@@ -77,7 +77,7 @@ directories will be processed in the order they were added.
 
 Show version information and exit.
 
-=item B<-w, --no-wants>
+=item B<-W, --no-wants>
 
 Don't auto-enable any services listed under directory I<wants> of a service
 being (auto-)enabled.
diff --git a/doc/aa-start.pod b/doc/aa-start.pod
index 2c3be07..a053745 100644
--- a/doc/aa-start.pod
+++ b/doc/aa-start.pod
@@ -4,7 +4,7 @@ aa-start - Start services
 
 =head1 SYNOPSIS
 
-B<aa-start> [B<-D>] [B<-r> I<repodir>] [B<-l> I<listdir>] [B<-w>]
+B<aa-start> [B<-D>] [B<-r> I<repodir>] [B<-l> I<listdir>] [B<-W>]
 [B<-t> I<timeout>] [I<service...>]
 
 =head1 OPTIONS
@@ -44,7 +44,7 @@ Timeout can also be set in service in a file I<timeout> in its servicedir.
 
 Show version information and exit.
 
-=item B<-w, --no-wants>
+=item B<-W, --no-wants>
 
 Don't auto-start any services listed under directory I<wants> of a service
 being (auto-)started.
diff --git a/src/anopa/aa-enable.c b/src/anopa/aa-enable.c
index 908f40e..f5c9441 100644
--- a/src/anopa/aa-enable.c
+++ b/src/anopa/aa-enable.c
@@ -185,8 +185,8 @@ dieusage (int rc)
             " -l, --listdir DIR             Use DIR to list services to enable\n"
             " -f, --set-finish TARGET       Create s6-svscan symlink finish to TARGET\n"
             " -c, --set-crash TARGET        Create s6-svscan symlink crash to TARGET\n"
-            " -n, --no-needs                Don't auto-enable services from 'needs'\n"
-            " -w, --no-wants                Don't auto-enable services from 'wants'\n"
+            " -N, --no-needs                Don't auto-enable services from 'needs'\n"
+            " -W, --no-wants                Don't auto-enable services from 'wants'\n"
             " -h, --help                    Show this help screen and exit\n"
             " -V, --version                 Show version information and exit\n"
             );
@@ -218,17 +218,17 @@ main (int argc, char * const argv[])
             { "help",               no_argument,        NULL,   'h' },
             { "skip-down",          required_argument,  NULL,   'k' },
             { "listdir",            required_argument,  NULL,   'l' },
-            { "no-needs",           no_argument,        NULL,   'n' },
+            { "no-needs",           no_argument,        NULL,   'N' },
             { "repodir",            required_argument,  NULL,   'r' },
             { "reset-source",       required_argument,  NULL,   'S' },
             { "source",             required_argument,  NULL,   's' },
             { "version",            no_argument,        NULL,   'V' },
-            { "no-wants",           no_argument,        NULL,   'w' },
+            { "no-wants",           no_argument,        NULL,   'W' },
             { NULL, 0, 0, 0 }
         };
         int c;
 
-        c = getopt_long (argc, argv, "c:Df:hk:l:nr:S:s:Vw", longopts, NULL);
+        c = getopt_long (argc, argv, "c:Df:hk:l:Nr:S:s:VW", longopts, NULL);
         if (c == -1)
             break;
         switch (c)
@@ -257,7 +257,7 @@ main (int argc, char * const argv[])
                 path_list = optarg;
                 break;
 
-            case 'n':
+            case 'N':
                 flags &= ~AA_FLAG_AUTO_ENABLE_NEEDS;
                 break;
 
@@ -279,7 +279,7 @@ main (int argc, char * const argv[])
             case 'V':
                 aa_die_version ();
 
-            case 'w':
+            case 'W':
                 flags &= ~AA_FLAG_AUTO_ENABLE_WANTS;
                 break;
 
diff --git a/src/anopa/aa-start.c b/src/anopa/aa-start.c
index baed8a9..3ebb5ef 100644
--- a/src/anopa/aa-start.c
+++ b/src/anopa/aa-start.c
@@ -214,7 +214,7 @@ dieusage (int rc)
             " -D, --double-output           Enable double-output mode\n"
             " -r, --repodir DIR             Use DIR as repository directory\n"
             " -l, --listdir DIR             Use DIR to list services to start\n"
-            " -w, --no-wants                Don't auto-start services from 'wants'\n"
+            " -W, --no-wants                Don't auto-start services from 'wants'\n"
             " -t, --timeout SECS            Use SECS seconds as default timeout\n"
             " -h, --help                    Show this help screen and exit\n"
             " -V, --version                 Show version information and exit\n"
@@ -246,12 +246,12 @@ main (int argc, char * const argv[])
             { "repodir",            required_argument,  NULL,   'r' },
             { "timeout",            required_argument,  NULL,   't' },
             { "version",            no_argument,        NULL,   'V' },
-            { "no-wants",           no_argument,        NULL,   'w' },
+            { "no-wants",           no_argument,        NULL,   'W' },
             { NULL, 0, 0, 0 }
         };
         int c;
 
-        c = getopt_long (argc, argv, "Dhl:r:t:Vw", longopts, NULL);
+        c = getopt_long (argc, argv, "Dhl:r:t:VW", longopts, NULL);
         if (c == -1)
             break;
         switch (c)
@@ -281,7 +281,7 @@ main (int argc, char * const argv[])
             case 'V':
                 aa_die_version ();
 
-            case 'w':
+            case 'W':
                 no_wants = 1;
                 break;