diff -Nru kde-workspace-4.8.1/debian/changelog kde-workspace-4.8.1/debian/changelog
--- kde-workspace-4.8.1/debian/changelog	2012-03-12 18:50:15.000000000 +0000
+++ kde-workspace-4.8.1/debian/changelog	2012-03-13 22:04:50.000000000 +0000
@@ -1,3 +1,13 @@
+kde-workspace (4:4.8.1-0ubuntu3) precise; urgency=low
+
+  * kubuntu_gtk2_engines_oxygen_config.diff:
+    - Make sure echo from coreutils is used for reliable \n handling
+    - Don't remove gtk2-default-theme.rc.sh, it's a regression in case
+      xsettings-kde isn't installed.
+  * Refresh kubuntu_plasma_netbook_for_small_screens.diff
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Tue, 13 Mar 2012 22:48:50 +0100
+
 kde-workspace (4:4.8.1-0ubuntu2) precise; urgency=low
 
   * Bump breaks/replaces of plasma-widgets-workspace for 4.8 (LP: #950408)
diff -Nru kde-workspace-4.8.1/debian/patches/kubuntu_gtk2_engines_oxygen_config.diff kde-workspace-4.8.1/debian/patches/kubuntu_gtk2_engines_oxygen_config.diff
--- kde-workspace-4.8.1/debian/patches/kubuntu_gtk2_engines_oxygen_config.diff	2012-03-12 18:50:15.000000000 +0000
+++ kde-workspace-4.8.1/debian/patches/kubuntu_gtk2_engines_oxygen_config.diff	2012-03-13 22:04:50.000000000 +0000
@@ -2,7 +2,7 @@
 ===================================================================
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -146,6 +146,44 @@ if test -z "$dl"; then
+@@ -146,6 +146,50 @@ if test -z "$dl"; then
    unset KLOCALE_LANGUAGES
  fi
  
@@ -25,13 +25,13 @@
 +  fi
 +fi
 +
-+# GTK2_RC_FILE was replaced by xsettings-kde
-+if [ -e $kdehome/env/gtk2-default-theme.rc.sh ] ; then
-+  rm -f $kdehome/env/gtk2-default-theme.rc.sh
-+fi
-+
-+if is_package_installed gtk2-engines-oxygen && is_package_installed kubuntu-default-settings; then
++if is_package_installed kubuntu-default-settings && (is_package_installed gtk2-engines-oxygen || is_package_installed gtk3-engines-oxygen); then
 +  # The theme and k-d-s are installed, configuring...
++  if [ ! -e $kdehome/env/gtk2-default-theme.rc.sh ] && [ -e /usr/share/kubuntu-default-settings/gtk2-default-theme.rc.sh ] ; then
++    mkdir -p $kdehome/env
++    cp -f /usr/share/kubuntu-default-settings/gtk2-default-theme.rc.sh $kdehome/env
++    chmod 755 $kdehome/env/gtk2-default-theme.rc.sh
++  fi
 +  if [ ! -e $HOME/.gtkrc-2.0-kde4 ]; then
 +    if [ -e /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 ] ; then
 +      cp -f /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 $HOME/.gtkrc-2.0-kde4
@@ -39,9 +39,15 @@
 +  else
 +    # xsettings-kde requires gtk-theme-name= to be set in gtkrc-2.0-kde4
 +    if ! grep -q gtk-theme-name $HOME/.gtkrc-2.0-kde4; then
-+    echo "\ngtk-theme-name=\"`egrep \"include \\\"/usr/share/themes/[^/]+/gtk-2.0/gtkrc\\\"\" $HOME/.gtkrc-2.0-kde4 | cut -d/ -f5`\"" >> $HOME/.gtkrc-2.0-kde4
++    /bin/echo -e "\ngtk-theme-name=\"`egrep \"include \\\"/usr/share/themes/[^/]+/gtk-2.0/gtkrc\\\"\" $HOME/.gtkrc-2.0-kde4 | cut -d/ -f5`\"" >> $HOME/.gtkrc-2.0-kde4
 +    fi
 +  fi
++else
++  # Either the theme or k-d-s are missing, not forcing the configuration then... 
++  if [ -e $kdehome/env/gtk2-default-theme.rc.sh ] ; then
++    rm -f $kdehome/env/gtk2-default-theme.rc.sh
++  fi
++
 +fi
 +
  # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
diff -Nru kde-workspace-4.8.1/debian/patches/kubuntu_plasma_netbook_for_small_screens.diff kde-workspace-4.8.1/debian/patches/kubuntu_plasma_netbook_for_small_screens.diff
--- kde-workspace-4.8.1/debian/patches/kubuntu_plasma_netbook_for_small_screens.diff	2012-03-12 18:50:15.000000000 +0000
+++ kde-workspace-4.8.1/debian/patches/kubuntu_plasma_netbook_for_small_screens.diff	2012-03-13 22:04:50.000000000 +0000
@@ -1,11 +1,11 @@
-Index: kdebase-workspace-4.6.1/startkde.cmake
+Index: b/startkde.cmake
 ===================================================================
---- kdebase-workspace-4.6.1.orig/startkde.cmake	2011-02-28 17:58:18.000000000 +0000
-+++ kdebase-workspace-4.6.1/startkde.cmake	2011-03-01 09:41:57.596867477 +0000
-@@ -214,6 +214,26 @@
-   fi
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -190,6 +190,26 @@ else
+ 
  fi
-
+ 
 +# In Kubuntu start plasma-netbook if the screen is small or if "netbook" parameter were passed to startkde.
 +if [ -e /usr/share/kubuntu-netbook-default-settings/share/autostart/plasma-netbook.desktop ] ; then
 +  HEIGHT=`xdpyinfo | grep dimensions | awk '{print $2}' | sed s,.*x,,`