diff --git a/.SRCINFO b/.SRCINFO
index aeb8944..ac1bb02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jan 23 10:23:54 UTC 2016
+# Mon Mar 21 14:47:21 UTC 2016
 pkgbase = ocp-git
 	pkgdesc = Open Cubic Player (GIT Version)
-	pkgver = 0.1.22.r68.849cc42
+	pkgver = 0.1.22.r71.58094b1
 	pkgrel = 1
 	url = http://stian.cubic.org/project-ocp.php
 	install = ocp-git.install
@@ -13,6 +13,7 @@ pkgbase = ocp-git
 	depends = hicolor-icon-theme
 	depends = libxpm
 	depends = libxxf86vm
+	depends = timidity++
 	optdepends = adplug: for OPL formats support
 	optdepends = alsa-lib: for ALSA output
 	optdepends = flac: for FLAC audio support
@@ -20,7 +21,7 @@ pkgbase = ocp-git
 	optdepends = libsidplay: for SID music support
 	optdepends = libvorbis: for Vorbis audio support
 	optdepends = sdl: for SDL user interface support
-	provides = ocp=0.1.22.r68.849cc42
+	provides = ocp=0.1.22.r71.58094b1
 	conflicts = ocp
 	source = ocp::git://git.code.sf.net/p/opencubicplayer/code
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7be7c9c..9ad0dc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ossi Saukko <osaukko at gmail dot com>
 _name=ocp
 pkgname=ocp-git
-pkgver=0.1.22.r68.849cc42
+pkgver=0.1.22.r71.58094b1
 pkgrel=1
 pkgdesc="Open Cubic Player (GIT Version)"
 arch=('i686' 'x86_64')
@@ -9,7 +9,8 @@ url="http://stian.cubic.org/project-ocp.php"
 license=('GPL')
 depends=('hicolor-icon-theme'
          'libxpm'
-         'libxxf86vm')
+         'libxxf86vm'
+         'timidity++')
 optdepends=('adplug: for OPL formats support'
             'alsa-lib: for ALSA output'
             'flac: for FLAC audio support'
@@ -32,9 +33,9 @@ pkgver() {
 
 build() {
     cd "${srcdir}/${_name}"
-    ./configure --prefix=/usr --sysconfdir=/etc
-
-    cd "${srcdir}/${_name}"
+    git submodule init
+    git submodule update
+    ./configure --prefix=/usr --sysconfdir=/etc --with-timidity-default-path=/etc/timidity++/
     make
 }
 
diff --git a/ocp-git.install b/ocp-git.install
index 810d7bf..6f87023 100644
--- a/ocp-git.install
+++ b/ocp-git.install
@@ -1,13 +1,13 @@
 infodir=usr/share/info
 
 post_install() {
-    [ -x usr/bin/install-info ] || return 0
-    install-info $infodir/ocp.info.gz $infodir/dir 2> /dev/null
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
     echo 
     echo Please note that you need to rebuild ocp-git after installing any of the optional dependencies for it.
     echo
+    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() {
@@ -22,4 +22,3 @@ post_remove() {
     update-desktop-database -q
     gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-