diff --git a/srcpkgs/xonotic/files/xonotic-glx.desktop b/srcpkgs/xonotic/files/xonotic-glx.desktop
deleted file mode 100644
index 9f9e78cc1c7..00000000000
--- a/srcpkgs/xonotic/files/xonotic-glx.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Xonotic (GLX)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-glx
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/srcpkgs/xonotic/files/xonotic-sdl.desktop b/srcpkgs/xonotic/files/xonotic-sdl.desktop
deleted file mode 100644
index 32b37f2c55a..00000000000
--- a/srcpkgs/xonotic/files/xonotic-sdl.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Xonotic (SDL)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-sdl
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index b4f51efcf1e..4c632a6ba15 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,7 +1,7 @@
 # Template file for 'xonotic'
 pkgname=xonotic
 version=0.8.6
-revision=1
+revision=2
 hostmakedepends="unzip automake libtool"
 makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
  libmodplug-devel libvorbis-devel libXpm-devel libjpeg-turbo-devel
@@ -39,6 +39,17 @@ do_build() {
 	make ${makejobs}
 }
 
+post_build() {
+  # Create .desktop for SDL
+	sed -e 's/Name=Xonotic/Name=Xonotic (SDL)/' \
+		misc/logos/xonotic.desktop > xonotic-sdl.desktop
+
+  # Create .desktop for GLX
+	sed -e 's/Exec=xonotic-sdl/Exec=xonotic-glx/' \
+		-e 's/Name=Xonotic/Name=Xonotic (GLX)/' \
+		misc/logos/xonotic.desktop > xonotic-glx.desktop
+}
+
 do_install() {
 	# binaries
 	vbin source/darkplaces/darkplaces-dedicated xonotic-dedicated
@@ -47,9 +58,9 @@ do_install() {
 
 	# convenience files
 	vmkdir usr/share/applications
-	install -Dm644 $FILESDIR/*.desktop -t $DESTDIR/usr/share/applications
-	install -Dm644 misc/logos/icons_png/xonotic_512.png \
-		$DESTDIR/usr/share/pixmaps/xonotic.png
+	vinstall xonotic-sdl.desktop 644 /usr/share/applications/
+	vinstall xonotic-glx.desktop 644 /usr/share/applications/
+	vinstall misc/logos/icons_png/xonotic_512.png 644 /usr/share/pixmaps/ xonotic.png
 
 	# crypto stuff
 	cd source/d0_blind_id