diff --git a/COPYING b/COPYING
index a1f19ff99d..426810a7fb 100644
--- a/COPYING
+++ b/COPYING
@@ -44,9 +44,9 @@ You can redistribute it and/or modify it under either the terms of the
      For the list of those files and their copying conditions, see the
      file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as 
+  5. The scripts and library files supplied as input to or produced as
      output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
+     copyright of the software, but belong to whomever generated them,
      and may be sold commercially, and may be aggregated with this
      software.
 
diff --git a/ChangeLog b/ChangeLog
index 11b0a742ac..22b4cca7a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 11 10:33:26 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* ChangeLog: Remove trailing-whitespaces.
+	  [ci skip][fix GH-1348]
+
 Tue May 10 21:05:45 2016  Benoit Daloze  <eregontp@gmail.com>
 
 	* insns.def (defineclass): Also raise an error when redeclaring the