diff -Nru xorg-7.5+1ubuntu5/debian/changelog xorg-7.5+1ubuntu6/debian/changelog
--- xorg-7.5+1ubuntu5/debian/changelog	2010-02-19 04:32:43.000000000 +0000
+++ xorg-7.5+1ubuntu6/debian/changelog	2010-02-19 06:03:07.000000000 +0000
@@ -1,3 +1,9 @@
+xorg (1:7.5+1ubuntu6) lucid; urgency=low
+
+  * Fix $OPTIONFILE parsing to only match keywords on the beginning of lines.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 19 Feb 2010 07:02:48 +0100
+
 xorg (1:7.5+1ubuntu5) lucid; urgency=low
 
   * debian/scripts/*: Drop -nv from xserver-xorg-video-all
diff -Nru xorg-7.5+1ubuntu5/debian/local/Xsession.d/20x11-common_process-args xorg-7.5+1ubuntu6/debian/local/Xsession.d/20x11-common_process-args
--- xorg-7.5+1ubuntu5/debian/local/Xsession.d/20x11-common_process-args	2010-02-19 03:27:09.000000000 +0000
+++ xorg-7.5+1ubuntu6/debian/local/Xsession.d/20x11-common_process-args	2010-02-19 06:02:45.000000000 +0000
@@ -5,6 +5,14 @@
 # read OPTIONFILE
 OPTIONS=$(cat "$OPTIONFILE") || true
 
+has_option() {
+  if [ "${OPTIONS#*
+$1}" != "$OPTIONS" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
 
 # Determine how many arguments were provided.
 case $# in
@@ -16,7 +24,7 @@
     case "$1" in
       failsafe)
         # Failsafe session was requested.
-        if [ "${OPTIONS#*allow-failsafe}" != "$OPTIONS" ]; then
+        if has_option allow-failsafe; then
           if [ -e /usr/bin/x-terminal-emulator ]; then
             if [ -x /usr/bin/x-terminal-emulator ]; then
               exec x-terminal-emulator -geometry +1+1
diff -Nru xorg-7.5+1ubuntu5/debian/local/Xsession.d/30x11-common_xresources xorg-7.5+1ubuntu6/debian/local/Xsession.d/30x11-common_xresources
--- xorg-7.5+1ubuntu5/debian/local/Xsession.d/30x11-common_xresources	2010-02-19 03:27:09.000000000 +0000
+++ xorg-7.5+1ubuntu6/debian/local/Xsession.d/30x11-common_xresources	2010-02-19 06:02:45.000000000 +0000
@@ -13,7 +13,7 @@
   fi
 fi
 
-if [ "${OPTIONS#*allow-user-resources}" != "$OPTIONS" ] && [ -f "$USRRESOURCES" ]; then
+if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then
   if type xrdb >/dev/null 2>&1; then
     xrdb -merge $USRRESOURCES
   else
diff -Nru xorg-7.5+1ubuntu5/debian/local/Xsession.d/50x11-common_determine-startup xorg-7.5+1ubuntu6/debian/local/Xsession.d/50x11-common_determine-startup
--- xorg-7.5+1ubuntu5/debian/local/Xsession.d/50x11-common_determine-startup	2010-02-19 03:27:09.000000000 +0000
+++ xorg-7.5+1ubuntu6/debian/local/Xsession.d/50x11-common_determine-startup	2010-02-19 06:02:45.000000000 +0000
@@ -7,7 +7,7 @@
 # executable, fall back to looking for a user's custom X session script, if
 # allowed by the options file.
 if [ -z "$STARTUP" ]; then
-  if [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then
+  if has_option allow-user-session; then
     for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
       if [ -e "$STARTUPFILE" ]; then
         if [ -x "$STARTUPFILE" ]; then
@@ -36,7 +36,7 @@
 # If we still have not found a startup program, give up.
 if [ -z "$STARTUP" ]; then
   ERRMSG="unable to start X session ---"
-  if [ "${OPTIONS#*allow-user-session}" != "$OPTIONS" ]; then
+  if has_option allow-user-session; then
     ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
   fi
   errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
diff -Nru xorg-7.5+1ubuntu5/debian/local/Xsession.d/90x11-common_ssh-agent xorg-7.5+1ubuntu6/debian/local/Xsession.d/90x11-common_ssh-agent
--- xorg-7.5+1ubuntu5/debian/local/Xsession.d/90x11-common_ssh-agent	2010-02-19 03:27:09.000000000 +0000
+++ xorg-7.5+1ubuntu6/debian/local/Xsession.d/90x11-common_ssh-agent	2010-02-19 06:02:45.000000000 +0000
@@ -6,7 +6,7 @@
 SSHAGENT=/usr/bin/ssh-agent
 SSHAGENTARGS=
 
-if [ "${OPTIONS#*use-ssh-agent}" != "$OPTIONS" ]; then
+if has_option use-ssh-agent; then
   if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
      && [ -z "$SSH2_AUTH_SOCK" ]; then
     STARTSSH=yes