diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4466a2fd..02044fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - Set `addr-gen-mode=eui64`
 - Set dnsmasq to listen to the Warewulf interface to prevent to binding to localhost:53
 - Added Ipv6 support to `/etc/hosts` on host and nodes.
+- Added IPv6 support to wwclient
 
 ### Removed
 
diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go
index 358c0b6b..29c9a97d 100644
--- a/internal/app/wwclient/root.go
+++ b/internal/app/wwclient/root.go
@@ -225,7 +225,11 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
 	var finishedInitialSync bool = false
 	ipaddr := os.Getenv("WW_IPADDR")
 	if ipaddr == "" {
-		ipaddr = conf.Ipaddr
+		if conf.Ipaddr6 != "" {
+			ipaddr = conf.Ipaddr6
+		} else {
+			ipaddr = conf.Ipaddr
+		}
 	}
 
 	for {