diff --git a/add-COPYING.patch b/add-COPYING.patch
new file mode 100644
index 0000000..b415a99
--- /dev/null
+++ b/add-COPYING.patch
@@ -0,0 +1,13 @@
+Index: csync2-2.0+git.1368794815.cf835a7/Makefile.am
+===================================================================
+--- csync2-2.0+git.1368794815.cf835a7.orig/Makefile.am
++++ csync2-2.0+git.1368794815.cf835a7/Makefile.am
+@@ -40,7 +40,7 @@ CLEANFILES = cfgfile_parser.c cfgfile_pa
+ 
+ DISTCLEANFILES = config.status config.h .deps/*.Po stamp-h1 Makefile Makefile.in configure
+ 
+-docfiles = ChangeLog README AUTHORS
++docfiles = ChangeLog README AUTHORS COPYING
+ 
+ if HAVE_PDFLATEX
+ 
diff --git a/csync2.changes b/csync2.changes
index 50e881e..3ea0d0b 100644
--- a/csync2.changes
+++ b/csync2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 26 09:07:40 UTC 2013 - tserong@suse.com
+
+- Ensure COPYING file is included in package
+  + Added add-COPYING.patch
+
 -------------------------------------------------------------------
 Wed Sep 11 05:12:22 UTC 2013 - tserong@suse.com
 
diff --git a/csync2.spec b/csync2.spec
index 409877e..d8f8620 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -38,6 +38,8 @@ Patch10:        add-ac_prog_cpp.patch
 Patch11:        fix-csync2_ssl_cert-filename.patch
 # PATCH-FIX-UPSTREAM -- fix-sonames.patch tserong@suse.com -- use properly versioned sonames in dlopen()
 Patch12:        fix-sonames.patch
+# PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc
+Patch13:        add-COPYING.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -75,6 +77,7 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -139,6 +142,7 @@ fi
 %{_unitdir}/csync2.socket
 %{_unitdir}/csync2@.service
 %dir %{_localstatedir}/lib/csync2/
+# Using docdir here ensures correct doc file tagging
 %{_docdir}/%{name}
 %dir %{_sysconfdir}/csync2/
 %config(noreplace) %{_sysconfdir}/csync2/csync2.cfg