diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d2bb17..0a87d42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,10 @@ TARGET_LINK_LIBRARIES(hoverboard ${SDL2PP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 # installation
 IF(SYSTEMWIDE)
+	CONFIGURE_FILE(misc/hoverboard.desktop.in misc/hoverboard.desktop)
+
 	INSTALL(TARGETS hoverboard RUNTIME DESTINATION ${BINDIR})
 	INSTALL(DIRECTORY data/ DESTINATION ${DATADIR})
-	INSTALL(FILES misc/xkcd.ico DESTINATION ${ICONDIR})
-	INSTALL(FILES misc/hoverboard.desktop DESTINATION ${DESKTOPDIR})
+	INSTALL(FILES misc/xkcd.ico DESTINATION ${ICONDIR} RENAME hoverboard.ico)
+	INSTALL(FILES ${PROJECT_BINARY_DIR}/misc/hoverboard.desktop DESTINATION ${DESKTOPDIR})
 ENDIF(SYSTEMWIDE)
diff --git a/misc/hoverboard.desktop b/misc/hoverboard.desktop.in
similarity index 82%
rename from misc/hoverboard.desktop
rename to misc/hoverboard.desktop.in
index e7b3219..103edcb 100644
--- a/misc/hoverboard.desktop
+++ b/misc/hoverboard.desktop.in
@@ -3,6 +3,6 @@ Type=Application
 Version=1.0
 Name=Hoverboard
 Comment=xkcd 1608 "Hoverboard" game
-Icon=hoverboard
+Icon=${ICONDIR}/hoverboard.ico
 Exec=hoverboard
 Categories=Game;AdventureGame;