diff --git a/bijiben-fix-i586-longint.patch b/bijiben-fix-i586-longint.patch
new file mode 100644
index 0000000..5040817
--- /dev/null
+++ b/bijiben-fix-i586-longint.patch
@@ -0,0 +1,32 @@
+From bbd6b4ab460a268110e94933c3bf0b667a594ff3 Mon Sep 17 00:00:00 2001
+From: Isaque Galdino <igaldino@gmail.com>
+Date: Thu, 15 Jun 2017 10:33:21 -0300
+Subject: memo-provider: Wrong output 64 bits format
+
+gcc7 is complaining about a format for a 64 bits integer. The expected
+argument is of type 'long int', but it is using a 'long long int'
+instead.
+
+To fix that problem, we changed the format "%li" to "%"G_GINT64_FORMAT.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=783714
+---
+ src/libbiji/provider/biji-memo-provider.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libbiji/provider/biji-memo-provider.c b/src/libbiji/provider/biji-memo-provider.c
+index 975cd11..0b82c1e 100644
+--- a/src/libbiji/provider/biji-memo-provider.c
++++ b/src/libbiji/provider/biji-memo-provider.c
+@@ -203,7 +203,7 @@ handle_next_item (BijiMemoProvider *self)
+ 
+     create_note_from_item (item);
+     /* debug pour tracker. Il faut en plus datasource->urn */
+-    g_debug ("created=%li", item->set.created);
++    g_debug ("created=%"G_GINT64_FORMAT, item->set.created);
+     g_debug ("title=%s", item->set.title);
+     g_debug ("url=%s", item->set.url);
+     g_debug ("content=%s\n================\n\n\n", item->set.content);
+-- 
+cgit v0.12
+
diff --git a/bijiben-memo-provider-crash-opening-memo.patch b/bijiben-memo-provider-crash-opening-memo.patch
new file mode 100644
index 0000000..08cb597
--- /dev/null
+++ b/bijiben-memo-provider-crash-opening-memo.patch
@@ -0,0 +1,34 @@
+From 1649d3a3d3bae9972ea89f08f78aea5b93cb96d6 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Sun, 11 Jun 2017 15:46:20 -0300
+Subject: memo-provider: Crash opening memo
+
+Application is crashing when trying to open a memo from the memo list.
+
+Code is not checking for null when processing start, last modified and
+created dates.
+
+This patch fixes that.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782998
+---
+ src/libbiji/provider/biji-memo-provider.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/libbiji/provider/biji-memo-provider.c b/src/libbiji/provider/biji-memo-provider.c
+index fa0540f..975cd11 100644
+--- a/src/libbiji/provider/biji-memo-provider.c
++++ b/src/libbiji/provider/biji-memo-provider.c
+@@ -75,6 +75,9 @@ time_val_from_icaltime (icaltimetype *itt, glong *result)
+   GTimeVal t;
+   gchar *iso;
+ 
++  if (!itt)
++    return FALSE;
++
+   t.tv_sec = 0;
+   t.tv_usec = 0;
+ 
+-- 
+cgit v0.12
+
diff --git a/bijiben.changes b/bijiben.changes
index b6075fc..c7d9432 100644
--- a/bijiben.changes
+++ b/bijiben.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jun 16 08:27:09 UTC 2017 - zaitor@opensuse.org
+
+- Add bijiben-fix-i586-longint.patch: Fix wrong int type
+  (bgo#783714).
+
+-------------------------------------------------------------------
+Mon Jun 12 21:56:49 UTC 2017 - zaitor@opensuse.org
+
+- Add bijiben-memo-provider-crash-opening-memo.patch: Application
+  is crashing when trying to open a memo from the memo list
+  (bgo#782998).
+
 -------------------------------------------------------------------
 Sun Jun 11 19:39:56 UTC 2017 - zaitor@opensuse.org
 
diff --git a/bijiben.spec b/bijiben.spec
index 3ea0e47..7a2bb9f 100644
--- a/bijiben.spec
+++ b/bijiben.spec
@@ -30,6 +30,10 @@ Source:         http://download.gnome.org/sources/bijiben/3.24/%{name}-%{version
 Patch0:         bijiben-fix-missing-break-in-case-statement.patch
 # PATCH-FIX-UPSTREAM bijiben-remove-warning-about-Trash-folder.patch bgo#783471 zaitor@opensuse.org -- local-provider: Remove warning about .Trash folder
 Patch1:         bijiben-remove-warning-about-Trash-folder.patch
+# PATCH-FIX-UPSTREAM bijiben-memo-provider-crash-opening-memo.patch bgo#782998 zaitor@opensuse.org -- memo-provider: Crash opening memo
+Patch2:         bijiben-memo-provider-crash-opening-memo.patch
+# PATCH-FIX-UPSTREAM bijiben-fix-i586-longint.patch bgo#783714 zaitor@opensuse.org -- Fix int type
+Patch3:         bijiben-fix-i586-longint.patch
 BuildRequires:  intltool >= 0.50.1
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
@@ -73,6 +77,8 @@ search results from documents.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure \