diff --git a/ChangeLog b/ChangeLog
index 1e34b6f3..9dfabdc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17738,3 +17738,5 @@
 	* Changed the default DB collation to 'utf8mb4_general_ci'.
 	* Removed the MYSQL_BUILTIN_DATABASE define from 'lib/rd.h'.
 	* Removed the POSTGRESQL_BUILTIN_DATABASE define from 'lib/rd.h'.
+2018-10-03 Fred Gleason <fredg@paravelsystems.com>
+	* Added a beta test warning to 'README'.
diff --git a/README b/README
index aafc62c5..3600d910 100644
--- a/README
+++ b/README
@@ -1,5 +1,10 @@
 This is the README file for the Rivendell package.
 
+WARNING: This is a BETA TEST version of Rivendell. As such, it is virtually
+         guaranteed to contain bugs, possibly severe ones that could
+         cause LOSS OF DATA. It is intended for testing purposes, and
+         should not be used in 'production' siuations.
+
 This software comes with ABSOLUTELY NO WARRANTY.  See the file COPYING for
 details.
 
@@ -8,8 +13,8 @@ to be a robust, functionally complete digital audio system for use in
 professional radio broadcast environments.
 
 See the file INSTALL for installation instructions.  If you are upgrading from
-a 1.x version of Rivendell, also see the file 'UPGRADING' for important notes
-and pointers.
+a 1.x or 2.x version of Rivendell, also see the file 'UPGRADING'
+for important notes and pointers.
 
 
 OVERVIEW