diff -u landscape-client-1.0.18/debian/rules landscape-client-1.0.18/debian/rules
--- landscape-client-1.0.18/debian/rules
+++ landscape-client-1.0.18/debian/rules
@@ -30,10 +30,13 @@
 		etc/landscape \
 		var/lib/landscape \
 		var/log/landscape \
+		usr/share/landscape
 
 	python setup.py install --root $(root_dir)
 
 	install -D -o root -g root -m 644 dbus/landscape.conf $(root_dir)/etc/dbus-1/system.d/landscape.conf
+	install -D -o root -g root -m 755 scripts/landscape-sysinfo.wrapper $(root_dir)/usr/share/landscape/landscape-sysinfo.wrapper
+
 
 binary-arch:
 # do nothing
diff -u landscape-client-1.0.18/debian/changelog landscape-client-1.0.18/debian/changelog
--- landscape-client-1.0.18/debian/changelog
+++ landscape-client-1.0.18/debian/changelog
@@ -1,3 +1,13 @@
+landscape-client (1.0.18-0ubuntu2) intrepid; urgency=low
+
+  * Fixes for (LP: #268352).
+    - scripts/landscape-sysinfo.wrapper: New script to run landscape-sysinfo
+      with leading whitespace.
+    - debian/rules: Install wrapper into /usr/share/landscape.
+    - debian/landscape-cliest.postinst: Link wrapper into place.
+
+ -- Christopher Armstrong <radix@ubuntu.com>  Tue, 09 Sep 2008 22:50:57 +0000
+
 landscape-client (1.0.18-0ubuntu1) intrepid; urgency=low
 
   * New upstream release 
diff -u landscape-client-1.0.18/debian/landscape-client.postinst landscape-client-1.0.18/debian/landscape-client.postinst
--- landscape-client-1.0.18/debian/landscape-client.postinst
+++ landscape-client-1.0.18/debian/landscape-client.postinst
@@ -33,20 +33,19 @@
         #  * Cache sysinfo in /etc/motd
         #  * Run sysinfo on every login
         SYSINFO="${RET:-Cache sysinfo in /etc/motd}"
+        WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
+        PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
+        UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
         if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
-            rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
-            ln -s /usr/bin/landscape-sysinfo /etc/update-motd.d/50-landscape-sysinfo
+            rm -f $PROFILE_LOCATION 2>/dev/null || true
+            ln -s $WRAPPER $UPDATE_MOTD_LOCATION
             /etc/init.d/update-motd refresh || true
         elif [ "$RET" = "Run sysinfo on every login" ]; then
-            if rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null; then
-                /etc/init.d/update-motd refresh || true
-            fi
-            echo /usr/bin/landscape-sysinfo > /etc/profile.d/landscape-sysinfo.sh
+            rm -f $UPDATE_MOTD_LOCATION 2>/dev/null &&  /etc/init.d/update-motd refresh || true
+            ln -s $WRAPPER $PROFILE_LOCATION
         else
-            if rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null; then
-                /etc/init.d/update-motd refresh || true
-            fi
-            rm -f /etc/profile.d/landscape-sysinfo.sh || true
+            rm -f $UPDATE_MOTD_LOCATION 2>/dev/null &&  /etc/init.d/update-motd refresh || true
+            rm -f $PROFILE_LOCATION || true
         fi
 
         # 0.9.1 introduces non-backwards compatible changes.  This detects
only in patch2:
unchanged:
--- landscape-client-1.0.18.orig/scripts/landscape-sysinfo.wrapper
+++ landscape-client-1.0.18/scripts/landscape-sysinfo.wrapper
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo
+/usr/bin/landscape-sysinfo
+