1 files changed, 12 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index a459ee65..dfdf2494 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1,12 @@
-(c) 2006 Thomas White <taw27@cam.ac.uk>
+(c) 2005-2011 Thomas White <taw@physics.org>
+
+
+CrystFEL is free software, which means you can redistribute it and/or modify it
+under the terms of the GNU General Public License.
+
+The GNU General Public License does not permit this software to be redistributed
+in proprietary programs.
+
+CrystFEL 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.