diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e6cb32b..6116af9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,6 +367,7 @@ endif()
 install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH})
 install(DIRECTORY ${AWE_THEMES_DIR} DESTINATION ${AWESOME_DATA_PATH})
 install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
+install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
 if(GENERATE_LUADOC)
     install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
 endif()
diff --git a/awesome.desktop b/awesome.desktop
new file mode 100644
index 00000000..00b770e3
--- /dev/null
+++ b/awesome.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Name=awesome
+Comment=Floating and tiling window manager
+TryExec=awesome
+Exec=awesome
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index 664edb1c..456da333 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -270,6 +270,7 @@ set(AWESOME_MAN_PATH         ${PREFIX}/share/man)
 set(AWESOME_LUA_LIB_PATH     ${AWESOME_DATA_PATH}/lib)
 set(AWESOME_ICON_PATH        ${AWESOME_DATA_PATH}/icons)
 set(AWESOME_THEMES_PATH      ${AWESOME_DATA_PATH}/themes)
+set(AWESOME_XSESSION_PATH    ${PREFIX}/xsessions)
 # }}}
 
 # {{{ Configure files