diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a5bf833d..9108e2d42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/common/version.c
     ${SOURCE_DIR}/common/xembed.c
     ${SOURCE_DIR}/common/xutil.c
+    ${SOURCE_DIR}/common/xcursor.c
     ${SOURCE_DIR}/layouts/fibonacci.c
     ${SOURCE_DIR}/layouts/floating.c
     ${SOURCE_DIR}/layouts/magnifier.c
diff --git a/common/xcursor.c b/common/xcursor.c
new file mode 100644
index 000000000..681cfe31b
--- /dev/null
+++ b/common/xcursor.c
@@ -0,0 +1,131 @@
+/*
+ * xcursor.c - X cursors management
+ *
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <X11/cursorfont.h>
+
+#include "common/xcursor.h"
+#include "common/util.h"
+
+static char const * const xcursor[] =
+{
+    [XC_X_cursor] = "X_cursor",
+    [XC_arrow] = "arrow",
+    [XC_based_arrow_down] = "based_arrow_down",
+    [XC_based_arrow_up] = "based_arrow_up",
+    [XC_boat] = "boat",
+    [XC_bogosity] = "bogosity",
+    [XC_bottom_left_corner] = "bottom_left_corner",
+    [XC_bottom_right_corner] = "bottom_right_corner",
+    [XC_bottom_side] = "bottom_side",
+    [XC_bottom_tee] = "bottom_tee",
+    [XC_box_spiral] = "box_spiral",
+    [XC_center_ptr] = "center_ptr",
+    [XC_circle] = "circle",
+    [XC_clock] = "clock",
+    [XC_coffee_mug] = "coffee_mug",
+    [XC_cross] = "cross",
+    [XC_cross_reverse] = "cross_reverse",
+    [XC_crosshair] = "crosshair",
+    [XC_diamond_cross] = "diamond_cross",
+    [XC_dot] = "dot",
+    [XC_dotbox] = "dotbox",
+    [XC_double_arrow] = "double_arrow",
+    [XC_draft_large] = "draft_large",
+    [XC_draft_small] = "draft_small",
+    [XC_draped_box] = "draped_box",
+    [XC_exchange] = "exchange",
+    [XC_fleur] = "fleur",
+    [XC_gobbler] = "gobbler",
+    [XC_gumby] = "gumby",
+    [XC_hand1] = "hand1",
+    [XC_hand2] = "hand2",
+    [XC_heart] = "heart",
+    [XC_icon] = "icon",
+    [XC_iron_cross] = "iron_cross",
+    [XC_left_ptr] = "left_ptr",
+    [XC_left_side] = "left_side",
+    [XC_left_tee] = "left_tee",
+    [XC_leftbutton] = "leftbutton",
+    [XC_ll_angle] = "ll_angle",
+    [XC_lr_angle] = "lr_angle",
+    [XC_man] = "man",
+    [XC_middlebutton] = "middlebutton",
+    [XC_mouse] = "mouse",
+    [XC_pencil] = "pencil",
+    [XC_pirate] = "pirate",
+    [XC_plus] = "plus",
+    [XC_question_arrow] = "question_arrow",
+    [XC_right_ptr] = "right_ptr",
+    [XC_right_side] = "right_side",
+    [XC_right_tee] = "right_tee",
+    [XC_rightbutton] = "rightbutton",
+    [XC_rtl_logo] = "rtl_logo",
+    [XC_sailboat] = "sailboat",
+    [XC_sb_down_arrow] = "sb_down_arrow",
+    [XC_sb_h_double_arrow] = "sb_h_double_arrow",
+    [XC_sb_left_arrow] = "sb_left_arrow",
+    [XC_sb_right_arrow] = "sb_right_arrow",
+    [XC_sb_up_arrow] = "sb_up_arrow",
+    [XC_sb_v_double_arrow] = "sb_v_double_arrow",
+    [XC_shuttle] = "shuttle",
+    [XC_sizing] = "sizing",
+    [XC_spider] = "spider",
+    [XC_spraycan] = "spraycan",
+    [XC_star] = "star",
+    [XC_target] = "target",
+    [XC_tcross] = "tcross",
+    [XC_top_left_arrow] = "top_left_arrow",
+    [XC_top_left_corner] = "top_left_corner",
+    [XC_top_right_corner] = "top_right_corner",
+    [XC_top_side] = "top_side",
+    [XC_top_tee] = "top_tee",
+    [XC_trek] = "trek",
+    [XC_ul_angle] = "ul_angle",
+    [XC_umbrella] = "umbrella",
+    [XC_ur_angle] = "ur_angle",
+    [XC_watch] = "watch",
+    [XC_xterm] = "xterm",
+};
+
+/** Get a cursor from a string.
+ * \param s The string.
+ */
+uint16_t
+xcursor_fromstr(const char *s)
+{
+    for(int i = 0; i < ssizeof(xcursor); i++)
+        if(!a_strcmp(s, xcursor[i]))
+            return i;
+    return 0;
+}
+
+/** Get a cursor name.
+ * \param c The cursor.
+ */
+const char *
+xcursor_tostr(uint16_t c)
+{
+    if(c < ssizeof(xcursor))
+        return xcursor[c];
+    return NULL;
+}
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/common/xcursor.h b/common/xcursor.h
new file mode 100644
index 000000000..8c51fd798
--- /dev/null
+++ b/common/xcursor.h
@@ -0,0 +1,31 @@
+/*
+ * xcursor.h - X cursors management
+ *
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef AWESOME_COMMON_XCURSORS_H
+#define AWESOME_COMMON_XCURSORS_H
+
+#include <stdint.h>
+
+uint16_t xcursor_fromstr(const char *);
+const char * xcursor_tostr(uint16_t);
+
+#endif
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80