diff --git a/graphviz-addons.changes b/graphviz-addons.changes
index 3e70099..fbe5a32 100644
--- a/graphviz-addons.changes
+++ b/graphviz-addons.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de
+
+- Fixed double file declaration in graphviz and graphviz-addons (x11)
+- Mark license files with %license instead of %doc
+
 -------------------------------------------------------------------
 Thu Oct 25 14:52:00 UTC 2018 - trenn@suse.de
 
diff --git a/graphviz-addons.spec b/graphviz-addons.spec
index 6b640c5..3160e3a 100644
--- a/graphviz-addons.spec
+++ b/graphviz-addons.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -444,7 +444,7 @@ rm -rf %{buildroot}%{_libdir}/graphviz/ruby
 rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_pango*
 rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib*
 # This is part of the gd subpkg only
-rm -f %{buildroot}%{_mandir}/man1/diffimg.1
+rm -f %{buildroot}%{_mandir}/man1/{diffimg.1*,dotty.1*,lefty.1*,lneato.1*}
 # This is part of the x11 subpkg only
 rm -rf %{buildroot}%{_datadir}/graphviz/lefty
 %endif
@@ -466,14 +466,14 @@ fi
 
 %if %{with extras}
 %files -n graphviz-gvedit
-%doc COPYING
+%license COPYING
 %{_bindir}/gvedit
 %dir %{_datadir}/%{mname}/gvedit
 %{_datadir}/%{mname}/gvedit/attrs.txt
 %{_mandir}/man1/gvedit.1%{ext_man}
 
 %files -n graphviz-smyrna
-%doc COPYING
+%license COPYING
 %{_bindir}/smyrna
 %{_datadir}/%{mname}/smyrna
 %{_mandir}/man1/smyrna.1%{ext_man}
@@ -521,7 +521,7 @@ fi
 %{_mandir}/man3/gv.3lua%{ext_man}
 
 %files -n graphviz-x11
-%doc COPYING
+%license COPYING
 %{_bindir}/dotty
 %{_bindir}/lefty
 %{_bindir}/lneato
@@ -572,7 +572,8 @@ fi
 
 %else
 %files
-%doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog
+%doc doc/FAQ.html AUTHORS README NEWS ChangeLog
+%license COPYING
 %{_bindir}/acyclic
 %{_bindir}/bcomps
 %{_bindir}/ccomps
diff --git a/graphviz.changes b/graphviz.changes
index 3e70099..fbe5a32 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de
+
+- Fixed double file declaration in graphviz and graphviz-addons (x11)
+- Mark license files with %license instead of %doc
+
 -------------------------------------------------------------------
 Thu Oct 25 14:52:00 UTC 2018 - trenn@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 74c7452..d5b60f3 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -444,7 +444,7 @@ rm -rf %{buildroot}%{_libdir}/graphviz/ruby
 rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_pango*
 rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib*
 # This is part of the gd subpkg only
-rm -f %{buildroot}%{_mandir}/man1/diffimg.1
+rm -f %{buildroot}%{_mandir}/man1/{diffimg.1*,dotty.1*,lefty.1*,lneato.1*}
 # This is part of the x11 subpkg only
 rm -rf %{buildroot}%{_datadir}/graphviz/lefty
 %endif
@@ -466,14 +466,14 @@ fi
 
 %if %{with extras}
 %files -n graphviz-gvedit
-%doc COPYING
+%license COPYING
 %{_bindir}/gvedit
 %dir %{_datadir}/%{mname}/gvedit
 %{_datadir}/%{mname}/gvedit/attrs.txt
 %{_mandir}/man1/gvedit.1%{ext_man}
 
 %files -n graphviz-smyrna
-%doc COPYING
+%license COPYING
 %{_bindir}/smyrna
 %{_datadir}/%{mname}/smyrna
 %{_mandir}/man1/smyrna.1%{ext_man}
@@ -521,7 +521,7 @@ fi
 %{_mandir}/man3/gv.3lua%{ext_man}
 
 %files -n graphviz-x11
-%doc COPYING
+%license COPYING
 %{_bindir}/dotty
 %{_bindir}/lefty
 %{_bindir}/lneato
@@ -572,7 +572,8 @@ fi
 
 %else
 %files
-%doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog
+%doc doc/FAQ.html AUTHORS README NEWS ChangeLog
+%license COPYING
 %{_bindir}/acyclic
 %{_bindir}/bcomps
 %{_bindir}/ccomps