diff --git a/ChangeLog b/ChangeLog
index 6be912d67c..5ac03ef329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-11  David Hampton  <hampton@employees.org>
+
+	* src/gnome-utils/dialog-commodity.c: Fix problem selecting quote
+	source.
+
+	* configure.in:
+	* src/gnome/gnc-splash.c:
+	* src/gnome/window-main.c: Give more control over what builds have
+	a version number and what builds hare labelled "cvs".
+
 2003-05-11  Derek Atkins  <derek@ihtfp.com>
 
 	* src/import-export/hbci/gnc-hbci-utils.c: you have to declare
diff --git a/configure.in b/configure.in
index 20324ef008..8162135496 100644
--- a/configure.in
+++ b/configure.in
@@ -31,6 +31,10 @@ AC_PREREQ(2.53)
 
 AC_PROG_CC
 
+# Comment out for production or semi-production builds.  I.E. Anything
+# that is explicitly tagged in cvs as a version.
+AC_DEFINE(GNUCASH_CVS,1,[Define if built from untagged cvs])
+
 GNUCASH_MAJOR_VERSION=1
 GNUCASH_MINOR_VERSION=9
 GNUCASH_MICRO_VERSION=0
diff --git a/src/gnome/gnc-splash.c b/src/gnome/gnc-splash.c
index 9f7855c8f4..9bc4aca665 100644
--- a/src/gnome/gnc-splash.c
+++ b/src/gnome/gnc-splash.c
@@ -70,12 +70,13 @@ gnc_show_splash_screen (void)
 
   frame = gtk_frame_new (NULL);
   vbox = gtk_vbox_new (FALSE, 3);
-  if (GNUCASH_MINOR_VERSION % 2) {
-    sprintf(ver_string, _("Version: Gnucash-cvs (built %s)"),
-	    GNUCASH_BUILD_DATE);
-  } else {
-    sprintf(ver_string, _("Version: Gnucash-%s"), VERSION);
-  }
+#ifdef GNUCASH_CVS
+  sprintf(ver_string, _("Version: Gnucash-%s cvs (built %s)"),
+	  VERSION, GNUCASH_BUILD_DATE);
+#else
+  sprintf(ver_string, _("Version: Gnucash-%s"), VERSION);
+#endif
+
   version = gtk_label_new (ver_string);
   separator = gtk_hseparator_new();
   progress = gtk_label_new(_("Loading..."));
diff --git a/src/gnome/window-main.c b/src/gnome/window-main.c
index 54793f829a..fa97d0ef46 100644
--- a/src/gnome/window-main.c
+++ b/src/gnome/window-main.c
@@ -716,11 +716,11 @@ gnc_main_window_about_cb (GtkWidget *widget, gpointer data)
   };
   gchar *ver_string;
 
-  if (GNUCASH_MINOR_VERSION % 2) {
-    ver_string = g_strdup_printf("%s (built %s)", VERSION, GNUCASH_BUILD_DATE);
-  } else {
-    ver_string = strdup(VERSION);
-  }
+#ifdef GNUCASH_CVS
+  ver_string = g_strdup_printf("%s cvs (built %s)", VERSION, GNUCASH_BUILD_DATE);
+#else
+  ver_string = strdup(VERSION);
+#endif
   about = gnome_about_new ("GnuCash", ver_string, copyright,
                            authors, message, NULL);
   g_free(ver_string);