diff --git a/.SRCINFO b/.SRCINFO
index 0400457..a53ed6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freecad-git
 	pkgdesc = A general purpose 3D CAD modeler - git checkout
-	pkgver = 0.17pre.r3959.g0ca5ebe78
+	pkgver = 0.17pre.r3961.g3b6020cda
 	pkgrel = 1
 	epoch = 1
 	url = http://www.freecadweb.org/
diff --git a/PKGBUILD b/PKGBUILD
index c0c319c..16e378a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _appname=freecad
 pkgname="${_appname}-git"
-pkgver=0.17pre.r3959.g0ca5ebe78
+pkgver=0.17pre.r3961.g3b6020cda
 pkgrel=1
 epoch=1
 pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -19,7 +19,7 @@ optdepends=('python2-matplotlib'
             'pycollada-git: Create, edit and load COLLADA documents.')
 provides=('freecad')
 conflicts=('freecad')
-source=("$pkgname::git+https://github.com/FreeCAD/FreeCAD.git"
+source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git"
         "freecad.desktop"
         "freecad.xml"
         "rpath.patch"
@@ -31,64 +31,64 @@ md5sums=('SKIP'
          '5a7beefb78ef73241b0e421fec67f4db')
 
 pkgver() {
-    cd "$pkgname"
+    cd "${srcdir}/${pkgname}"
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
 }
 
 prepare() {
-    cd "$srcdir/$pkgname"
-    patch -Np1 -i "$srcdir/rpath.patch"
-    patch -Np1 -i "$srcdir/fix-occ-search.patch"
+    cd "${srcdir}/${pkgname}"
+    patch -Np1 -i "${srcdir}/rpath.patch"
+    patch -Np1 -i "${srcdir}/fix-occ-search.patch"
 }
 
 build() {
-    cd "$srcdir/$pkgname"
+    cd "${srcdir}/${pkgname}"
 
     cmake -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX:PATH="/opt/${_appname}" \
-          -DOCC_INCLUDE_DIR:PATH=/opt/opencascade7/include/opencascade \
-          -DOCC_LIBRARY_DIR:PATH=/opt/opencascade7/lib \
-          -DVTK_DIR:PATH=/opt/vtk-qt4/lib/cmake/vtk-7.0 \
-          -DCMAKE_PREFIX_PATH=/opt/opencascade7 \
-          -DCMAKE_INCLUDE_PATH:PATH=/opt/opencascade7/include/opencascade \
-          -DCMAKE_LIBRARY_PATH:PATH=/opt/opencascade7/lib \
-          -DCMAKE_INSTALL_RPATH=/opt/opencascade7/lib:/opt/vtk-qt4/lib \
-          -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
-          -DPYTHON_SUFFIX=-python2.7 \
-          -DPYTHON_BASENAME=-python2.7 \
-          -DPYSIDEUIC4BINARY:FILEPATH=/usr/bin/python2-pyside-uic \
+          -DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \
+          -DOCC_INCLUDE_DIR="/opt/opencascade7/include/opencascade" \
+          -DOCC_LIBRARY_DIR="/opt/opencascade7/lib" \
+          -DVTK_DIR="/opt/vtk-qt4/lib/cmake/vtk-7.0" \
+          -DCMAKE_PREFIX_PATH="/opt/opencascade7" \
+          -DCMAKE_INCLUDE_PATH="/opt/opencascade7/include/opencascade" \
+          -DCMAKE_LIBRARY_PATH="/opt/opencascade7/lib" \
+          -DCMAKE_INSTALL_RPATH="/opt/opencascade7/lib;/opt/vtk-qt4/lib" \
+          -DPYTHON_EXECUTABLE="/usr/bin/python2" \
+          -DPYTHON_SUFFIX="-python2.7" \
+          -DPYTHON_BASENAME="-python2.7" \
+          -DPYSIDEUIC4BINARY="/usr/bin/python2-pyside-uic" \
           -DBUILD_FEM_NETGEN=1
 
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname"
+    cd "${srcdir}/${pkgname}"
     local bin="FreeCAD"
     local bin_cmd="FreeCADCmd"
 
-    make DESTDIR="$pkgdir" install
+    make DESTDIR="${pkgdir}" install
 	
     # Symlink binaries to /usr/bin.
-    mkdir -p "$pkgdir/usr/bin"
-    ln -s "/opt/${_appname}/bin/${bin}" "$pkgdir/usr/bin/${bin}"
-    ln -s "/opt/${_appname}/bin/${bin_cmd}" "$pkgdir/usr/bin/${bin_cmd}"
+    mkdir -p "${pkgdir}/usr/bin"
+    ln -s "/opt/${_appname}/bin/${bin}" "${pkgdir}/usr/bin/${bin}"
+    ln -s "/opt/${_appname}/bin/${bin_cmd}" "${pkgdir}/usr/bin/${bin_cmd}"
 
     # Lowercase aliases like the official arch package.
-    ln -s "/opt/${_appname}/bin/${bin}" "$pkgdir/usr/bin/${bin,,}"
-    ln -s "/opt/${_appname}/bin/${bin_cmd}" "$pkgdir/usr/bin/${bin_cmd,,}"
+    ln -s "/usr/bin/${bin}" "${pkgdir}/usr/bin/${bin,,}"
+    ln -s "/usr/bin/${bin_cmd}" "${pkgdir}/usr/bin/${bin_cmd,,}"
 
     # Install pixmaps and desktop shortcut.
     for i in 16 32 48 64; do
         install -Dm644 "src/Gui/Icons/freecad-icon-${i}.png" \
-            "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/${_appname}.png"
+            "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_appname}.png"
     done
     install -Dm644 "src/Gui/Icons/freecad.svg" \
-        "$pkgdir/usr/share/icons/hicolor/scalable/apps/${_appname}.svg"
+        "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_appname}.svg"
     desktop-file-install \
-        --dir="$pkgdir/usr/share/applications" "$srcdir/${_appname}.desktop"
+        --dir="${pkgdir}/usr/share/applications" "${srcdir}/${_appname}.desktop"
 
     # Install mime info.
-    install -D -m644 "$srcdir/${_appname}.xml" \
-        "$pkgdir/usr/share/mime/packages/${_appname}.xml"
+    install -D -m644 "${srcdir}/${_appname}.xml" \
+        "${pkgdir}/usr/share/mime/packages/${_appname}.xml"
 }