diff --git a/awesome.c b/awesome.c
index 32148074..182f7c89 100644
--- a/awesome.c
+++ b/awesome.c
@@ -147,7 +147,6 @@ setup(Display *disp, awesome_config *awesomeconf)
     XSetWindowAttributes wa;
 
     /* init atoms */
-    wmatom[WMName] = XInternAtom(disp, "WM_NAME", False);
     wmatom[WMState] = XInternAtom(disp, "WM_STATE", False);
     netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False);
     netatom[NetWMName] = XInternAtom(disp, "_NET_WM_NAME", False);
diff --git a/awesome.h b/awesome.h
index ff1d8dbf..3f3cd22a 100644
--- a/awesome.h
+++ b/awesome.h
@@ -39,7 +39,7 @@ enum
 enum
 { NetSupported, NetWMName, NetLast };   /* EWMH atoms */
 enum
-{ WMName, WMState, WMLast };     /* default atoms */
+{ WMState, WMLast };     /* default atoms */
 
 Bool gettextprop(Display *, Window, Atom, char *, unsigned int);   /* return text property, UTF-8 compliant */
 void updatebarpos(Display *, Statusbar);        /* updates the bar position */
diff --git a/client.c b/client.c
index 2599b6ea..27587f53 100644
--- a/client.c
+++ b/client.c
@@ -179,7 +179,7 @@ inline void
 updatetitle(Client * c)
 {
     if(!gettextprop(c->display, c->win, netatom[NetWMName], c->name, sizeof c->name))
-        gettextprop(c->display, c->win, wmatom[WMName], c->name, sizeof c->name);
+        gettextprop(c->display, c->win, XInternAtom(c->display, "WM_NAME", False), c->name, sizeof c->name);
 }
 
 /** Ban client