diff --git a/glib2-codegen-headers.patch b/glib2-codegen-headers.patch
new file mode 100644
index 0000000..482a9f5
--- /dev/null
+++ b/glib2-codegen-headers.patch
@@ -0,0 +1,14 @@
+diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
+index 9d9099f..1cfe7c1 100755
+--- a/gio/gdbus-2.0/codegen/codegen_main.py
++++ b/gio/gdbus-2.0/codegen/codegen_main.py
+@@ -209,7 +209,7 @@ def codegen_main():
+             print_error('Using --body requires --output')
+ 
+         c_file = args.output
+-        header_name = os.path.splitext(c_file)[0] + '.h'
++        header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'
+ 
+     all_ifaces = []
+     for fname in args.files + args.xml_files:
+
diff --git a/glib2.changes b/glib2.changes
index 161b319..7c3ebcd 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 16 16:05:46 UTC 2018 - dimstar@opensuse.org
+
+- Add glib2-codegen-headers.patch: gdbus-codegen: Fix header
+  include in the body file (bgo#795802).
+
 -------------------------------------------------------------------
 Sat Apr  7 14:45:53 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/glib2.spec b/glib2.spec
index d272131..77f85a6 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -53,6 +53,8 @@ Patch14:        glib2-dbus-socket-path.patch
 Patch16:        glib2-gdbus-codegen-version.patch
 # PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 xwang@suse.com -- gsettings default value can be overridden depending on session
 Patch18:        glib2-gsettings-overrides-per-session.patch
+# PATCH-FIx-UPSTREAM glib2-codegen-headers.patch bgo#795802 dimstar@opensuse.org -- gdbus-codegen: Fix header include in the body file
+Patch19:        glib2-codegen-headers.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -257,6 +259,7 @@ translation-update-upstream
 %patch14 -p1
 %patch16 -p1
 %patch18 -p1
+%patch19 -p1
 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
 cp -a %{SOURCE4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then