diff --git a/.SRCINFO b/.SRCINFO
index 20fbbff..0d217f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,31 @@
 pkgbase = ocp
 	pkgdesc = Open Cubic Player
-	pkgver = 0.2.90
+	pkgver = 0.2.99
 	pkgrel = 1
-	url = https://github.com/mywave82/opencubicplayer
+	url = https://stian.cubic.org/project-ocp.php
+	install = ocp.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = desktop-file-utils
 	makedepends = git
 	makedepends = xa
-	makedepends = patch
+	makedepends = desktop-file-utils
+	depends = hicolor-icon-theme
 	depends = libxxf86vm
-	depends = libvorbis
 	depends = libxpm
 	depends = alsa-lib
-	depends = libmad
-	depends = flac
 	depends = sdl2
-	depends = adplug
+	depends = flac
+	depends = libvorbis
+	depends = libmad
 	depends = libjpeg-turbo
 	depends = libpng
 	depends = freetype2
 	depends = ttf-unifont
-	source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.90
-	source = git+https://github.com/mywave82/timidity.git
-	source = git+https://github.com/mywave82/sidplay-residfp-ocp.git
-	source = git+https://github.com/libsidplayfp/exsid-driver.git
-	source = git+https://github.com/mywave82/resid.git
-	source = fix-unifont.diff
+	depends = libdiscid
+	depends = cjson
+	conflicts = ocp-git
+	source = git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.99
 	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = 9eb83ffbabec3f1dd66f66c9100a9c08
 
 pkgname = ocp
diff --git a/PKGBUILD b/PKGBUILD
index f55f4a8..3ff851d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,53 @@
-# Maintainer: Mikael Eriksson <mikael_eriksson@miffe.org>
-# Original PKGBUILD by: berkus [berkus_at_madfire_dot_net]
+# Maintainer: Xavier (sapphirus at azorium dot net)
+# Original Maintainer: Ossi Saukko <osaukko at gmail dot com>
 
+_pkgbdir=opencubicplayer
 pkgname=ocp
-pkgver=0.2.90
+pkgver=0.2.99
 pkgrel=1
 pkgdesc="Open Cubic Player"
 arch=('i686' 'x86_64')
-url="https://github.com/mywave82/opencubicplayer"
-depends=('libxxf86vm' 'libvorbis' 'libxpm' 'alsa-lib' 'libmad' 'flac' 'sdl2' 'adplug' 'libjpeg-turbo' 'libpng' 'freetype2' 'ttf-unifont')
-makedepends=('desktop-file-utils' 'git' 'xa' 'patch')
+url="https://stian.cubic.org/project-ocp.php"
 license=('GPL')
-source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}
-        git+https://github.com/mywave82/timidity.git
-		git+https://github.com/mywave82/sidplay-residfp-ocp.git
-		git+https://github.com/libsidplayfp/exsid-driver.git
-		git+https://github.com/mywave82/resid.git
-		fix-unifont.diff)
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         '9eb83ffbabec3f1dd66f66c9100a9c08')
+install=ocp.install
+
+conflicts=('ocp-git')
+
+depends=('hicolor-icon-theme'
+	 'libxxf86vm' 
+	 'libxpm' 
+	 'alsa-lib' 
+	 'sdl2'
+	 'flac'
+	 'libvorbis'
+	 'libmad'
+	 'libjpeg-turbo' 
+	 'libpng' 
+	 'freetype2' 
+	 'ttf-unifont' 
+	 'libdiscid' 
+	 'cjson')
+
+makedepends=('git'
+             'xa'
+	     'desktop-file-utils')
+
+source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver})
+md5sums=('SKIP')
 
 prepare() {
-	cd opencubicplayer
-
-	patch -p1 -i "$srcdir/fix-unifont.diff"
-
+        cd $_pkgbdir
 	git submodule init
-	git config submodule.playgmi/timidity-git.url "$srcdir/timidity"
-	git config submodule.playsid/sidplayfp-git.url "$srcdir/sidplay-residfp-ocp"
-	git submodule update
-
-	cd playsid/libsidplayfp-git
-
-	git submodule init
-	git config submodule.src/builders/exsid-builder/driver.url "$srcdir/exsid-driver"
-	git config submodule.src/builders/resid-builder/resid.url "$srcdir/resid"
-	git submodule update
+	git submodule update --init --recursive
 }
 
 build() {
-	cd opencubicplayer
-
-	./configure --prefix=/usr --sysconfdir=/etc --with-unifontdir=/usr/share/fonts/Unifont
+  	cd $_pkgbdir	
+	./configure --prefix=/usr --sysconfdir=/etc --with-unifontdir=/usr/share/fonts/Unifont --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf		
 	make DESTDIR="$pkgdir"
 }
 
 package() {
-	cd opencubicplayer
+	cd $_pkgbdir
 	make DESTDIR="$pkgdir" install
 }
diff --git a/ocp.install b/ocp.install
new file mode 100644
index 0000000..f09788d
--- /dev/null
+++ b/ocp.install
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    update-desktop-database -q
+    [ -x usr/bin/install-info ] || return 0
+    install-info $infodir/ocp.info.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    install-info --delete $infodir/ocp.info.gz $infodir/dir 2> /dev/null
+}
+
+post_remove() {
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}