diff --git a/decls.patch b/decls.patch
new file mode 100644
index 0000000..4caca07
--- /dev/null
+++ b/decls.patch
@@ -0,0 +1,25 @@
+Index: gpm-1.20.7/src/daemon/open_console.c
+===================================================================
+--- gpm-1.20.7.orig/src/daemon/open_console.c
++++ gpm-1.20.7/src/daemon/open_console.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
+ #include <sys/ioctl.h>              /* ioctl             */
++#include <sys/sysmacros.h>	    /* major */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+Index: gpm-1.20.7/src/prog/gpm-root.y
+===================================================================
+--- gpm-1.20.7.orig/src/prog/gpm-root.y
++++ gpm-1.20.7/src/prog/gpm-root.y
+@@ -1196,7 +1196,7 @@ int main(int argc, char **argv)
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+ #if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
++   sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+    childaction.sa_mask=0;
+ #endif /* __GLIBC__ */
diff --git a/gpm.changes b/gpm.changes
index e5b8b9b..1004bde 100644
--- a/gpm.changes
+++ b/gpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  5 13:10:44 UTC 2017 - schwab@suse.de
+
+- decls.patch: fix missing declarations
+
 -------------------------------------------------------------------
 Mon Jun 12 16:55:57 UTC 2017 - adam.majer@suse.de
 
diff --git a/gpm.spec b/gpm.spec
index ad40669..562eefa 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -55,6 +55,8 @@ Patch28:        gpm-dependencies.patch
 Patch29:        gpm-do_create_symlink.patch
 #PATCH-FIX-UPSTREAM Copy the current licence text from gpl-2.0+ to gpm.h
 Patch30:        gpm-fix_fsf_addess.patch
+#PATCH-FIX-UPSTREAM Fix missing declarations
+Patch31:        decls.patch
 BuildRequires:  bison
 BuildRequires:  libtool
 BuildRequires:  lzma
@@ -118,6 +120,7 @@ Development files for the gpm (general purpose mouse) package.
 %patch28
 %patch29
 %patch30
+%patch31 -p1
 cp %{S:2} %{S:3} %{S:4} .
 cp %{S:7} COPYING