diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch
index 5039c52..dd4d367 100644
--- a/gcc6-fix-errors.patch
+++ b/gcc6-fix-errors.patch
@@ -1,11 +1,13 @@
---- kyotocabinet-1.2.76/kcdbext.h	2016-05-25 11:32:53.591866016 +0200
-+++ kyotocabinet-1.2.76/kcdbext.h	2012-05-24 18:27:59.000000000 +0200
-@@ -1278,7 +1278,7 @@
+Index: kyotocabinet-1.2.76/kcdbext.h
+===================================================================
+--- kyotocabinet-1.2.76.orig/kcdbext.h
++++ kyotocabinet-1.2.76/kcdbext.h
+@@ -1278,7 +1278,7 @@ class IndexDB {
      if (omode_ == 0) {
        set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
        *sp = 0;
 -      return false;
-+      return '\0';
++      return NULL;
      }
      if (!cache_) return db_.get(kbuf, ksiz, sp);
      size_t dvsiz = 0;
diff --git a/kyotocabinet-fix-debuginfo.patch b/kyotocabinet-fix-debuginfo.patch
new file mode 100644
index 0000000..fc5b505
--- /dev/null
+++ b/kyotocabinet-fix-debuginfo.patch
@@ -0,0 +1,15 @@
+Index: kyotocabinet-1.2.76/configure.in
+===================================================================
+--- kyotocabinet-1.2.76.orig/configure.in
++++ kyotocabinet-1.2.76/configure.in
+@@ -35,8 +35,8 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C
+ MYPCFILES="kyotocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
+-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
++MYCFLAGS="-Wall -fPIC -fsigned-char "
++MYCXXFLAGS="-Wall -fPIC -fsigned-char -fvisibility-inlines-hidden"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
+ MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
diff --git a/kyotocabinet.changes b/kyotocabinet.changes
index 5da933d..87dfa8f 100644
--- a/kyotocabinet.changes
+++ b/kyotocabinet.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  4 03:47:22 UTC 2017 - crrodriguez@opensuse.org
+
+- kyotocabinet-fix-debuginfo.patch: Fix debuginfo generation
+- gcc6-fix-errors.patch: return NULL instead, make GCC7 happy 
+
 -------------------------------------------------------------------
 Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com
 
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index df47a38..41c7869 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kyotocabinet
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,8 +28,10 @@ Source:         http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         %{name}-fix_rpath.patch
 Patch2:         configure-8-byte-atomics.patch 
-# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
+# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6/GCC7.
 Patch3:         gcc6-fix-errors.patch
+# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Do not supress debuginfo
+Patch4:         kyotocabinet-fix-debuginfo.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -110,6 +112,7 @@ Kyoto Cabinet within a proprietary software, the commercial license is required.
 %patch1 -p 1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 sed -ie "/ldconfig/d" Makefile.in
 sed -ie "/DOCDIR/d" Makefile.in