diff --git a/PKGBUILD b/PKGBUILD
index e3697d4..8149aab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,45 @@
-# Based on quakespasm PKGBUILD
-
-_pkgname=quakespasm
-pkgname=${_pkgname}-spiked-git
+_pkgname=quakespasm-spiked
+pkgname=${_pkgname}-git
 pkgver=0.92.1.r332.gd7f84a92
 pkgrel=1
 pkgdesc="A modern Quake 1 engine. Forked from Quakespasm. AKA QSS. Git version with optional Mission pack desktop files."
 arch=('i686' 'x86_64')
 url="http://triptohell.info/moodles/qss/"
 license=('GPL2')
-depends=('libvorbis' 'libmad' 'sdl2' 'opus' 'opusfile')
-conflicts=('quakespasm' 'quakespasm-svn')
-provides=('quakespasm')
+depends=('libvorbis' 'libmad' 'flac' 'opusfile' 'libmikmod' 'sdl2')
+conflicts=('quakespasm-spiked')
+provides=('quakespasm-spiked')
 install=$_pkgname.install
 source=("${_pkgname}::git+https://github.com/Shpoike/Quakespasm"
-        $_pkgname.desktop
-        $_pkgname-mp1.desktop
-        $_pkgname-mp2.desktop
-        $_pkgname-impel.desktop)
+        $_pkgname.desktop)
 sha1sums=('SKIP'
-          '7a78889a7a6e24047b4777a8b4827e29cfc87381'
-          '2b774f68f889308ba0b8de69580a32ed11f833ec'
-          '1184a40775fc46c129828d4a9a35785542c62ee3'
-          '2c97f722fc5c9f8d8f1a9a01f55491a448a9253e')
+          '3138e0f57c06e9431d1b030fed0983f5fd7db393')
 
-# Using the most recent un-annotated tag reachable from the last commit:
 pkgver() {
-  cd "$_pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	cd "$_pkgname"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$_pkgname/$_pkgname/Quake/"
-  msg "Starting make..."
-  make DO_USERDIRS=1 USE_SDL2=1
+	cd "$srcdir/$_pkgname/quakespasm/Quake/"
+	make \
+		DO_USERDIRS=1 \
+		USE_SDL2=1 \
+		USE_CODEC_FLAC=1 \
+		USE_CODEC_OPUS=1 \
+		USE_CODEC_MIKMOD=1 \
+		USE_CODEC_UMX=1
 }
 
 package() {
-  cd "$srcdir/$_pkgname/$_pkgname/Quake/"
-  install -Dm755 quakespasm "$pkgdir"/usr/bin/$_pkgname
-  
-  for i in 16 24 32 48 64 72; do
-    install -Dm644 $srcdir/$_pkgname/$_pkgname/Misc/QuakeSpasm_512.png $pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/quakespasm.png
-  done
+	cd "$srcdir/$_pkgname/quakespasm/Quake/"
+	install -Dm755 quakespasm "$pkgdir"/usr/bin/$_pkgname
 
-  install -Dm644 $srcdir/$_pkgname.desktop $pkgdir/usr/share/applications/$_pkgname.desktop
-#
-# Uncomment lines depending on the mission pack(s)
-# or extension you have.
-#
-# install -Dm644 $srcdir/$_pkgname-mp1.desktop $pkgdir/usr/share/applications/$_pkgname-mp1.desktop
-# install -Dm644 $srcdir/$_pkgname-mp2.desktop $pkgdir/usr/share/applications/$_pkgname-mp2.desktop
-# install -Dm644 $srcdir/$_pkgname-impel.desktop $pkgdir/usr/share/applications/$_pkgname-impel.desktop
+	for i in 16 24 32 48 64 72; do
+		install -Dm644 $srcdir/$_pkgname/quakespasm/Misc/QuakeSpasm_512.png $pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png
+	done
 
+	install -Dm644 $srcdir/$_pkgname.desktop $pkgdir/usr/share/applications/$_pkgname.desktop
 }
 
 
diff --git a/quakespasm-impel.desktop b/quakespasm-impel.desktop
deleted file mode 100644
index 0b17efb..0000000
--- a/quakespasm-impel.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Quake - Abyss of Pandemonium
-Icon=quakespasm
-Exec=quakespasm -game impel
-Categories=Game;Shooter;
-Comment=Quake (quakespasm engine) + Abyss of Pandemonium
-Terminal=false
-StartupNotify=true
diff --git a/quakespasm-mp1.desktop b/quakespasm-mp1.desktop
deleted file mode 100644
index f6d881e..0000000
--- a/quakespasm-mp1.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Quake - MP 1
-Icon=quakespasm
-Exec=quakespasm -game hipnotic
-Categories=Game;Shooter;
-Comment=Quake (quakespasm engine) + Mission Pack 1
-Terminal=false
-StartupNotify=true
diff --git a/quakespasm-mp2.desktop b/quakespasm-mp2.desktop
deleted file mode 100644
index 1f6f87e..0000000
--- a/quakespasm-mp2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Quake - MP 2
-Icon=quakespasm
-Exec=quakespasm -game rogue
-Categories=Game;Shooter;
-Comment=Quake (quakespasm engine) + Mission Pack 2
-Terminal=false
-StartupNotify=true
diff --git a/quakespasm.desktop b/quakespasm.desktop
index 0a0b2a3..72b3b6a 100644
--- a/quakespasm.desktop
+++ b/quakespasm.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=Quake
-Icon=quakespasm
-Exec=quakespasm
+Icon=quakespasm-spiked
+Exec=quakespasm-spiked
 Categories=Game;Shooter;
-Comment=Quake (quakespasm engine)
+Comment=Quake (quakespasm-spiked engine)
 Terminal=false
 StartupNotify=true
diff --git a/quakespasm.install b/quakespasm.install
index 8b4e0fe..9418943 100644
--- a/quakespasm.install
+++ b/quakespasm.install
@@ -5,7 +5,7 @@ post_install() {
 		:: additionally pak1.pak for the whole game.
 		:: Put them into <YOUR_HOME_DIR>/.quakespasm/id1/
 		
-                :: If you have uncommented line in package(),
+		:: If you have uncommented line in package(),
 		:: Here is how to install MPs and extensions.
 
 		:: There is desktop file for Mission Pack 1 (hipnotic)