diff --git a/trunk/0001-Fix-compiliation-warnings-errors.patch b/trunk/0001-Fix-compiliation-warnings-errors.patch
new file mode 100644
index 0000000..db1446a
--- /dev/null
+++ b/trunk/0001-Fix-compiliation-warnings-errors.patch
@@ -0,0 +1,39 @@
+From e0e42221ceb77d88be64fac1c09792dc5c9e2f43 Mon Sep 17 00:00:00 2001
+From: Ben Iofel <iofelben@gmail.com>
+Date: Thu, 17 Mar 2016 18:28:02 -0400
+Subject: [PATCH] Fix compiliation warnings & errors
+
+---
+ src/dbgengine/nmv-dbg-common.h        | 2 +-
+ src/dbgengine/nmv-i-var-list-walker.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h
+index ad3cc00b..0edac7c0 100644
+--- a/src/dbgengine/nmv-dbg-common.h
++++ b/src/dbgengine/nmv-dbg-common.h
+@@ -171,7 +171,7 @@ public:
+ 
+     bool has_slot () const
+     {
+-        return m_slot;
++        return static_cast<bool> (m_slot);
+     }
+ 
+     template<class T>
+diff --git a/src/dbgengine/nmv-i-var-list-walker.h b/src/dbgengine/nmv-i-var-list-walker.h
+index b719c0de..f2f3229d 100644
+--- a/src/dbgengine/nmv-i-var-list-walker.h
++++ b/src/dbgengine/nmv-i-var-list-walker.h
+@@ -22,7 +22,7 @@
+  *
+  *See COPYRIGHT file copyright information.
+  */
+-#ifndef __NMV_VAR_LIST_WALKER_H__
++#ifndef __NMV_I_VAR_LIST_WALKER_H__
+ #define __NMV_I_VAR_LIST_WALKER_H__
+ 
+ #include "nmv-i-var-walker.h"
+-- 
+2.13.0
+
diff --git a/trunk/0001-Use-RefPtr-bool-operator-in-the-conditions.patch b/trunk/0001-Use-RefPtr-bool-operator-in-the-conditions.patch
new file mode 100644
index 0000000..3414d25
--- /dev/null
+++ b/trunk/0001-Use-RefPtr-bool-operator-in-the-conditions.patch
@@ -0,0 +1,36 @@
+From 262cf9657f9c2727a816972b348692adcc666008 Mon Sep 17 00:00:00 2001
+From: Marcin Kolny <marcin.kolny@gmail.com>
+Date: Fri, 1 Jul 2016 19:45:05 +0200
+Subject: [PATCH] Use RefPtr::bool() operator in the conditions
+
+Since bool() operator in RefPtr class is explicit,
+comparision with integer doesn't compile.
+---
+ src/persp/dbgperspective/nmv-dbg-perspective.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
+index be652db5..ac207e49 100644
+--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
++++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
+@@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const common::DisassembleInfo &a_info,
+     a_source_editor->clear_decorations ();
+ 
+     Glib::RefPtr<Gsv::Buffer> asm_buf;
+-    if ((asm_buf = a_source_editor->get_assembly_source_buffer ()) == 0) {
++    if (!(asm_buf = a_source_editor->get_assembly_source_buffer ())) {
+         SourceEditor::setup_buffer_mime_and_lang (asm_buf, "text/x-asm");
+         a_source_editor->register_assembly_source_buffer (asm_buf);
+         asm_buf = a_source_editor->get_assembly_source_buffer ();
+@@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code ()
+ 
+     Glib::RefPtr<Gsv::Buffer> source_buf;
+     UString source_path;
+-    if ((source_buf = source_editor->get_non_assembly_source_buffer ()) == 0) {
++    if (!(source_buf = source_editor->get_non_assembly_source_buffer ())) {
+         // Woops!
+         // We don't have any source code buffer. Let's try hard to get
+         // the source code corresponding to the current frame. For that,
+-- 
+2.13.0
+
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index a5e8f60..9432b49 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -9,19 +9,23 @@ arch=('x86_64')
 license=('GPL')
 url='https://projects.gnome.org/nemiver/'
 depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desktop-schemas')
-makedepends=('boost' 'intltool' 'gnome-common' 'yelp-tools' 'git')
-source=("git+https://git.gnome.org/browse/nemiver#commit=1ef54607bfb463")
+makedepends=('boost' 'intltool' 'gnome-common' 'yelp-tools')
+source=("https://download.gnome.org/sources/nemiver/0.9/nemiver-0.9.6.tar.xz"
+         0001-Fix-compiliation-warnings-errors.patch
+         0001-Use-RefPtr-bool-operator-in-the-conditions.patch)
 options=('!emptydirs')
-sha256sums=('SKIP')
+sha256sums=('85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2'
+            '164ed1177a75dd1f39e3fb755b6d0249845c26f8cb21097d161e86b10f00cb89'
+            '46c6b819bf417e94f71605770e6b8246a3586d1cccf0aae4749d4b1d7d9ec1c4')
 
 prepare() {
-  cd "$pkgname"
-
-  NOCONFIGURE=1 ./autogen.sh
+  cd "$pkgname-$pkgver"
+  patch -p1 -i ../0001-Fix-compiliation-warnings-errors.patch
+  patch -p1 -i ../0001-Use-RefPtr-bool-operator-in-the-conditions.patch
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -38,7 +42,7 @@ build() {
 }
 
 package() {
-  make -C "$pkgname" DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
 # getver: git.gnome.org/browse/nemiver/plain/configure.ac