diff --git a/SDL2.spec.in b/SDL2.spec.in
index eee5e5d835..812d2d861a 100644
--- a/SDL2.spec.in
+++ b/SDL2.spec.in
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %{__defattr}
-%doc README*.txt COPYING.txt CREDITS.txt BUGS.txt
+%doc README*.txt LICENSE.txt CREDITS.txt BUGS.txt
 %{_libdir}/lib*.%{__soext}.*
 
 %files devel
diff --git a/docs/README.md b/docs/README.md
index 34e457ada9..30277437e7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -21,7 +21,7 @@ SDL is written in C, works natively with C++, and there are bindings
 available for several other languages, including C# and Python.
 
 This library is distributed under the zlib license, which can be found
-in the file "COPYING.txt".
+in the file "LICENSE.txt".
 
 The best way to learn how to use SDL is to check out the header files in
 the "include" subdirectory and the programs in the "test" subdirectory.
diff --git a/visualtest/README.txt b/visualtest/README.txt
index f7718ad78a..0d9a905f6e 100644
--- a/visualtest/README.txt
+++ b/visualtest/README.txt
@@ -3,7 +3,7 @@
 \mainpage Visual and Interactive Test Automation for SDL 2.0
 
 \section license_sec License
-Check the file \c COPYING.txt for licensing information.
+Check the file \c LICENSE.txt for licensing information.
 
 \section intro_sec Introduction
 The goal of this GSoC project is to automate the testing of testsprite2.
diff --git a/visualtest/include/SDL_visualtest_action_configparser.h b/visualtest/include/SDL_visualtest_action_configparser.h
index 3409248524..490c8a3598 100644
--- a/visualtest/include/SDL_visualtest_action_configparser.h
+++ b/visualtest/include/SDL_visualtest_action_configparser.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_action_configparser.h
  *
diff --git a/visualtest/include/SDL_visualtest_exhaustive_variator.h b/visualtest/include/SDL_visualtest_exhaustive_variator.h
index 6fee88f8f4..4637ce29e1 100644
--- a/visualtest/include/SDL_visualtest_exhaustive_variator.h
+++ b/visualtest/include/SDL_visualtest_exhaustive_variator.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_exhaustive_variator.h
  *
diff --git a/visualtest/include/SDL_visualtest_parsehelper.h b/visualtest/include/SDL_visualtest_parsehelper.h
index 0a12c65c73..4558552c13 100644
--- a/visualtest/include/SDL_visualtest_parsehelper.h
+++ b/visualtest/include/SDL_visualtest_parsehelper.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_parsehelper.h
  *
diff --git a/visualtest/include/SDL_visualtest_process.h b/visualtest/include/SDL_visualtest_process.h
index b548690c20..632e0ac279 100644
--- a/visualtest/include/SDL_visualtest_process.h
+++ b/visualtest/include/SDL_visualtest_process.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_process.h
  *
diff --git a/visualtest/include/SDL_visualtest_random_variator.h b/visualtest/include/SDL_visualtest_random_variator.h
index 99a13c2e30..0514ce6312 100644
--- a/visualtest/include/SDL_visualtest_random_variator.h
+++ b/visualtest/include/SDL_visualtest_random_variator.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_random_variator.h
  *
diff --git a/visualtest/include/SDL_visualtest_rwhelper.h b/visualtest/include/SDL_visualtest_rwhelper.h
index 2fbf10e141..bc39425948 100644
--- a/visualtest/include/SDL_visualtest_rwhelper.h
+++ b/visualtest/include/SDL_visualtest_rwhelper.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file rwhelper.c
  *
diff --git a/visualtest/include/SDL_visualtest_screenshot.h b/visualtest/include/SDL_visualtest_screenshot.h
index 1900ea4e29..69411e99df 100644
--- a/visualtest/include/SDL_visualtest_screenshot.h
+++ b/visualtest/include/SDL_visualtest_screenshot.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_screenshot.h
  *
diff --git a/visualtest/include/SDL_visualtest_sut_configparser.h b/visualtest/include/SDL_visualtest_sut_configparser.h
index 42a1088564..63506f5a02 100644
--- a/visualtest/include/SDL_visualtest_sut_configparser.h
+++ b/visualtest/include/SDL_visualtest_sut_configparser.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_sut_configparser.h
  *
diff --git a/visualtest/include/SDL_visualtest_variator_common.h b/visualtest/include/SDL_visualtest_variator_common.h
index 0b7c153e26..19a5b37828 100644
--- a/visualtest/include/SDL_visualtest_variator_common.h
+++ b/visualtest/include/SDL_visualtest_variator_common.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_variator_common.h
  *
diff --git a/visualtest/include/SDL_visualtest_variators.h b/visualtest/include/SDL_visualtest_variators.h
index ce1e785b5d..e14f67d2a4 100644
--- a/visualtest/include/SDL_visualtest_variators.h
+++ b/visualtest/include/SDL_visualtest_variators.h
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file SDL_visualtest_variators.h
  *
diff --git a/visualtest/src/action_configparser.c b/visualtest/src/action_configparser.c
index bab7fc13e8..6d95b91afb 100644
--- a/visualtest/src/action_configparser.c
+++ b/visualtest/src/action_configparser.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file action_configparser.c
  *
diff --git a/visualtest/src/harness_argparser.c b/visualtest/src/harness_argparser.c
index 93cf614a33..aa814a67b6 100644
--- a/visualtest/src/harness_argparser.c
+++ b/visualtest/src/harness_argparser.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file harness_argparser.c
  *
diff --git a/visualtest/src/linux/linux_process.c b/visualtest/src/linux/linux_process.c
index 27765c5621..2fef09c353 100644
--- a/visualtest/src/linux/linux_process.c
+++ b/visualtest/src/linux/linux_process.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  *  \file linux_process.c
  * 
diff --git a/visualtest/src/parsehelper.c b/visualtest/src/parsehelper.c
index 7d601179ba..01e64b04c4 100644
--- a/visualtest/src/parsehelper.c
+++ b/visualtest/src/parsehelper.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file parsehelper.c
  *
diff --git a/visualtest/src/rwhelper.c b/visualtest/src/rwhelper.c
index a50254006c..1b7ac183da 100644
--- a/visualtest/src/rwhelper.c
+++ b/visualtest/src/rwhelper.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file rwhelper.c
  *
diff --git a/visualtest/src/screenshot.c b/visualtest/src/screenshot.c
index 7d19c7f88a..394ae09071 100644
--- a/visualtest/src/screenshot.c
+++ b/visualtest/src/screenshot.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file screenshot.c 
  *
diff --git a/visualtest/src/sut_configparser.c b/visualtest/src/sut_configparser.c
index cf18b6208f..b4f8e39510 100644
--- a/visualtest/src/sut_configparser.c
+++ b/visualtest/src/sut_configparser.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file sut_configparser.c
  *
diff --git a/visualtest/src/testharness.c b/visualtest/src/testharness.c
index 25e41a611f..56a01201f4 100644
--- a/visualtest/src/testharness.c
+++ b/visualtest/src/testharness.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  *  \file testharness.c 
  *
diff --git a/visualtest/src/variator_common.c b/visualtest/src/variator_common.c
index dec3d8aacb..4eea9b41b6 100644
--- a/visualtest/src/variator_common.c
+++ b/visualtest/src/variator_common.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file variator_common.c
  *
diff --git a/visualtest/src/variator_exhaustive.c b/visualtest/src/variator_exhaustive.c
index 2a0ab35c72..3e8f9c80d1 100644
--- a/visualtest/src/variator_exhaustive.c
+++ b/visualtest/src/variator_exhaustive.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file variator_exhaustive.c
  *
diff --git a/visualtest/src/variator_random.c b/visualtest/src/variator_random.c
index 14b5d48a80..2c4f058550 100644
--- a/visualtest/src/variator_random.c
+++ b/visualtest/src/variator_random.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file variator_random.c
  *
diff --git a/visualtest/src/variators.c b/visualtest/src/variators.c
index 2d63113c53..57767e587f 100644
--- a/visualtest/src/variators.c
+++ b/visualtest/src/variators.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file variators.c
  *
diff --git a/visualtest/src/windows/windows_process.c b/visualtest/src/windows/windows_process.c
index ad0938951e..da7a99c588 100644
--- a/visualtest/src/windows/windows_process.c
+++ b/visualtest/src/windows/windows_process.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file windows_process.c 
  *
diff --git a/visualtest/src/windows/windows_screenshot.c b/visualtest/src/windows/windows_screenshot.c
index 7855903593..5f26754c03 100644
--- a/visualtest/src/windows/windows_screenshot.c
+++ b/visualtest/src/windows/windows_screenshot.c
@@ -1,4 +1,4 @@
-/* See COPYING.txt for the full license governing this code. */
+/* See LICENSE.txt for the full license governing this code. */
 /**
  * \file windows_screenshot.c 
  *