diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..873e54e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,9 @@
+The server part (the dist-git sub-directory) is licensed under the MIT license
+with the following exceptions:
+
+    scripts/httpd/upload.cgi is under GPLv1
+
+The client part (the dist-git-client sub-directory) is GPLv2+.
+
+Copies of all the licenses mentioned here are distributed with the project
+release tarballs.
diff --git a/dist-git/COPYING b/dist-git/COPYING
deleted file mode 100644
index a7dc99c..0000000
--- a/dist-git/COPYING
+++ /dev/null
@@ -1,5 +0,0 @@
-This project is licensed under MIT license with the following exceptions:
-
-scripts/httpd/upload.cgi is under GPLv1
-
-Copies of all the licenses above are distributed with the project.