diff --git a/internal/app/wwctl/node/list/root.go b/internal/app/wwctl/node/list/root.go
index e9c78d6c..b354c881 100644
--- a/internal/app/wwctl/node/list/root.go
+++ b/internal/app/wwctl/node/list/root.go
@@ -1,16 +1,32 @@
 package list
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/hpcng/warewulf/internal/pkg/node"
+	"github.com/spf13/cobra"
+)
 
 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:     "list [OPTIONS] [PATTERN]",
-		Short:   "List nodes",
-		Long:    "This command lists all configured nodes. Optionally, it will list only\n" +
-		         "nodes matching a glob PATTERN.",
+		Use:                   "list [OPTIONS] [PATTERN]",
+		Short:                 "List nodes",
+		Long: "This command lists all configured nodes. Optionally, it will list only\n" +
+			"nodes matching a glob PATTERN.",
 		RunE:    CobraRunE,
 		Aliases: []string{"ls"},
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			if len(args) != 0 {
+				return nil, cobra.ShellCompDirectiveNoFileComp
+			}
+
+			nodeDB, _ := node.New()
+			nodes, _ := nodeDB.FindAllNodes()
+			var node_names []string
+			for _, node := range nodes {
+				node_names = append(node_names, node.Id.Get())
+			}
+			return node_names, cobra.ShellCompDirectiveNoFileComp
+		},
 	}
 	ShowNet  bool
 	ShowIpmi bool