diff --git a/COPYING b/COPYING
index e70efd4..5f3f605 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,13 @@
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index 4a11bce..0000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,17 +0,0 @@
-offlineimap Mail syncing software
-Copyright (C) 2002 - 2009 John Goerzen
-<jgoerzen@complete.org>
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-