diff --git a/contrib/realtime/mysql/musiconhold.sql b/contrib/realtime/mysql/musiconhold.sql
new file mode 100644
index 0000000000000000000000000000000000000000..63ccd8dc4f48bfc0ece9207540750323f1797e09
--- /dev/null
+++ b/contrib/realtime/mysql/musiconhold.sql
@@ -0,0 +1,19 @@
+CREATE TABLE musiconhold (
+	-- Name of the MOH class
+	name char(80) not null primary key,
+	-- One of 'custom', 'files', 'mp3nb', 'quietmp3nb', or 'quietmp3'
+	mode char(80) null,
+	-- If 'custom', directory is ignored.  Otherwise, specifies a directory with files to play or a stream URL
+	directory char(255) null,
+	-- If 'custom', application will be invoked to provide MOH.  Ignored otherwise.
+	application char(255) null,
+	-- Digit associated with this MOH class, when MOH is selectable by the caller.
+	digit char(1) null,
+	-- One of 'random' or 'alpha', to determine how files are played.  If NULL, files are played in directory order
+	sort char(10) null,
+	-- In custom mode, the format of the audio delivered.  Ignored otherwise.  Defaults to SLIN.
+	format char(10) null,
+	-- When this record was last modified
+	stamp timestamp
+);
+
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index d10baa2431abf192ae165064eb68c80269da3697..5650ddc4db5621273ed78be131325b0bd4521b2b 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1097,9 +1097,12 @@ static int init_files_class(struct mohclass *class)
 		return -1;
 	}
 
+#if 0
+	/* XXX This isn't correct.  Args is an application for custom mode. XXX */
 	if (strchr(class->args, 'r')) {
 		ast_set_flag(class, MOH_RANDOMIZE);
 	}
+#endif
 
 	return 0;
 }