diff --git a/gnome-session-main-init.patch b/gnome-session-main-init.patch
index 3e5b633..9824680 100644
--- a/gnome-session-main-init.patch
+++ b/gnome-session-main-init.patch
@@ -23,8 +23,8 @@
  
    gsm_motd_start ();
  
-+  // move this down so the environments from above get set up
-+  // correctly before assistive modules activate items
++  /* move this down so the environments from above get set up
++     correctly before assistive modules activate items  */
 +  env_a_t_support = g_getenv (ACCESSIBILITY_ENV);
 +  if (env_a_t_support)
 +    a_t_support = atoi (env_a_t_support);
diff --git a/gnome-session.changes b/gnome-session.changes
index b58a9cc..5c48d36 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep  4 17:53:31 CEST 2007 - maw@suse.de
+
+- Update gnome-session-main-init.patch to use old-fashioned C
+  style comments in lieu of C++ style comments, courtesy of Calvin
+  (#302316 and bugzilla.gnome.org #469958).
+
 -------------------------------------------------------------------
 Fri Aug 31 17:47:03 CEST 2007 - maw@suse.de
 
diff --git a/gnome-session.spec b/gnome-session.spec
index c044166..7b213f5 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -16,7 +16,7 @@ BuildRequires:  CASA-devel control-center2-devel fdupes gnome-common gnome-deskt
 License:        GPL v2 or later, LGPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.19.90
-Release:        1
+Release:        4
 Summary:        Session Tools for the GNOME 2.x Desktop
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gnome
@@ -161,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}-2.0.lang
 
 %changelog
+* Tue Sep 04 2007 - maw@suse.de
+- Update gnome-session-main-init.patch to use old-fashioned C
+  style comments in lieu of C++ style comments, courtesy of Calvin
+  (#302316 and bugzilla.gnome.org #469958).
 * Fri Aug 31 2007 - maw@suse.de
 - Update to version 2.19.90:
   + Updated translations.