diff --git a/COPYING b/COPYING
index a86ddcb38..8ad3bdd86 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
 KeePassX - http://www.keepassx.org/
-Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+Copyright (C) 2010-2011 Felix Geyer <debfx@fobos.de>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,14 +18,9 @@ Name: KeePassX
 Maintainer: Felix Geyer <debfx@fobos.de>
 Source: http://www.keepassx.org/
 
-Copyright: 2010, Felix Geyer <debfx@fobos.de>
+Copyright: 2010-2011, Felix Geyer <debfx@fobos.de>
 License: GPL-2 or GPL-3
 
-Files: cmake/FindLibgcrypt.cmake
-Copyright: 2006, Pino Toscano <toscano.pino@tiscali.it>
-           2008, Modestas Vainius <modestas@vainius.eu>
-License: BSD
-
 Files: share/icons/entries/*.png
 Copyright: 2003-2004, David Vignoni <david@icon-king.com>
 License: LGPL-2.1
@@ -34,10 +29,6 @@ Files: src/crypto/salsa20/*
 Copyright: is in public domain
 License: -
 
-Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor
-Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
+Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor, tests/modeltest.*
+Copyright: 2009-2011, Nokia Corporation and/or its subsidiary(-ies)
 License: LGPL-2.1 or GPL-3
-
-Files: tests/modeltest.*
-Copyright: 2007, Trolltech ASA
-License: GPL-2