diff --git a/awesomerc.1.txt b/awesomerc.1.txt
index e651ea636..b64a9246b 100644
--- a/awesomerc.1.txt
+++ b/awesomerc.1.txt
@@ -180,7 +180,7 @@ This widget shows a list of running windows.
     Background color for focused window.
 *focus_fg*::
     Foreground color for focused window.
-*align*::
+*text_align*::
     Text alignement.
 *show_icons*::
     Show applications icons.
@@ -207,7 +207,7 @@ This widget shows a text.
     Set width.
 *text*::
     Text to change.
-*align*::
+*text_align*::
     Text alignement.
 *x*::
     Horizontal offset (auto-alignment if not set).
diff --git a/common/configopts.c b/common/configopts.c
index 2a1d86a7b..6977ac79a 100644
--- a/common/configopts.c
+++ b/common/configopts.c
@@ -100,7 +100,7 @@ cfg_opt_t widget_textbox_opts[] =
     CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
-    CFG_STR((char *) "align", (char *) "center", CFGF_NONE),
+    CFG_STR((char *) "text_align", (char *) "center", CFGF_NONE),
     CFG_END()
 };
 cfg_opt_t widget_tasklist_opts[] =
@@ -113,7 +113,7 @@ cfg_opt_t widget_tasklist_opts[] =
     CFG_STR((char *) "focus_fg", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "focus_bg", (char *) NULL, CFGF_NONE),
     CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
-    CFG_STR((char *) "align", (char *) "left", CFGF_NONE),
+    CFG_STR((char *) "text_align", (char *) "left", CFGF_NONE),
     CFG_STR((char *) "show", (char *) "tags", CFGF_NONE),
     CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE),
     CFG_END()
diff --git a/widgets/tasklist.c b/widgets/tasklist.c
index 0783d5fb0..af48bbcfe 100644
--- a/widgets/tasklist.c
+++ b/widgets/tasklist.c
@@ -296,7 +296,7 @@ tasklist_new(Statusbar *statusbar, cfg_t *config)
     else
         d->fg_sel = globalconf.screens[statusbar->screen].colors_selected[ColFG];
 
-    d->align = draw_get_align(cfg_getstr(config, "align"));
+    d->align = draw_get_align(cfg_getstr(config, "text_align"));
     d->show_icons = cfg_getbool(config, "show_icons");
 
     buf = cfg_getstr(config, "show");
diff --git a/widgets/textbox.c b/widgets/textbox.c
index c0982eeee..bf7fcacae 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -118,7 +118,7 @@ textbox_new(Statusbar *statusbar, cfg_t *config)
         d->bg = globalconf.screens[statusbar->screen].colors_normal[ColBG];
 
     d->width = cfg_getint(config, "width");
-    d->align = draw_get_align(cfg_getstr(config, "align"));
+    d->align = draw_get_align(cfg_getstr(config, "text_align"));
 
     if((buf = cfg_getstr(config, "font")))
         w->font = XftFontOpenName(globalconf.display, get_phys_screen(statusbar->screen), buf);