diff --git a/02-Spelling-typos.patch b/02-Spelling-typos.patch
new file mode 100644
index 0000000..49c3d33
--- /dev/null
+++ b/02-Spelling-typos.patch
@@ -0,0 +1,23 @@
+From: Robert Luberda <robert@debian.org>
+Date: Wed, 4 May 2011 22:38:50 +0200
+Subject: Spelling typos
+
+Fix spelling typos found by lintian
+---
+ maa/sl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sl.c
++++ b/sl.c
+@@ -176,9 +176,9 @@ sl_List sl_create( int (*compare)( const
+    }
+ 
+    if (!compare)
+-      err_internal( __func__, "compare fuction is NULL\n" );
++      err_internal( __func__, "compare function is NULL\n" );
+    if (!key)
+-      err_internal( __func__, "key fuction is NULL\n" );
++      err_internal( __func__, "key function is NULL\n" );
+ 
+    l          = mem_get_object( _sl_Memory );
+ #if MAA_MAGIC
diff --git a/03-Fix-gcc-8-ftbfs.patch b/03-Fix-gcc-8-ftbfs.patch
new file mode 100644
index 0000000..bba0060
--- /dev/null
+++ b/03-Fix-gcc-8-ftbfs.patch
@@ -0,0 +1,24 @@
+From: Robert Luberda <robert@debian.org>
+Date: Sun, 3 Jun 2018 16:28:38 +0200
+Subject: Fix FTBFS with gcc-8
+
+Increase buffer size to fix build failures like the one below:
+ ../log.c:328:40: error: '%s' directive output may be truncated writing up to 4095 bytes into a region of size between 3838 and 4093 [-Werror=format-truncation=]
+   snprintf (buf, sizeof (buf), "%s(%s) %s\n",
+
+Bugs-Debian: https://bugs.debian.org/897789
+---
+ maa/log.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/log.c
++++ b/log.c
+@@ -297,7 +297,7 @@ static void _log_base_va(
+ {
+    va_list ap_copy;
+    time_t t;
+-   static char   buf [4096] = "";
++   static char   buf [8192] = "";
+    static char   buf_main [4096] = "";
+    static char   buf_preamble [256] = "";
+ 
diff --git a/libmaa.changes b/libmaa.changes
index 0ca3a61..ee975ab 100644
--- a/libmaa.changes
+++ b/libmaa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  9 12:27:04 UTC 2018 - Matěj Cepl <mcepl@suse.com>
+
+- Add 02-Spelling-typos.patch and 03-Fix-gcc-8-ftbfs.patch from Debian
+  package.
+
 -------------------------------------------------------------------
 Sun Nov 27 05:26:01 UTC 2011 - brunciter@localhost.lan
 
diff --git a/libmaa.spec b/libmaa.spec
index a715a10..92f40df 100644
--- a/libmaa.spec
+++ b/libmaa.spec
@@ -13,6 +13,8 @@ Summary:        Library providing many low-level data structures
 Url:            http://www.dict.org
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:         02-Spelling-typos.patch
+Patch1:         03-Fix-gcc-8-ftbfs.patch
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libtool
@@ -58,6 +60,7 @@ This RPM contains the development files for libmaa
 
 %prep
 %setup -q
+%autopatch -p 1
 
 %build
 %configure --enable-dictorg