diff -Nru ubiquity-2.18.6/debian/changelog ubiquity-2.18.7/debian/changelog
--- ubiquity-2.18.6/debian/changelog	2014-04-15 18:58:50.000000000 +0000
+++ ubiquity-2.18.7/debian/changelog	2014-04-16 10:51:38.000000000 +0000
@@ -1,3 +1,14 @@
+ubiquity (2.18.7) trusty; urgency=medium
+
+  [ Aurélien Gâteau ]
+  * KDE: Remove spacer to fix vertical space in sidebar LP: #1308440
+
+  [ Dimitri John Ledkov ]
+  * Fix localechooser-apply in OEM configuration mode (LP: #1307983),
+    whilst previous only fixed the offline installation mode.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 16 Apr 2014 11:51:38 +0100
+
 ubiquity (2.18.6) trusty; urgency=medium
 
   * Automatic update of included source packages: localechooser 2.49ubuntu5.
diff -Nru ubiquity-2.18.6/gui/qt/app.ui ubiquity-2.18.7/gui/qt/app.ui
--- ubiquity-2.18.6/gui/qt/app.ui	2013-08-02 11:06:30.000000000 +0000
+++ ubiquity-2.18.7/gui/qt/app.ui	2014-04-16 10:20:37.000000000 +0000
@@ -210,19 +210,6 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>213</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
         <widget class="QFrame" name="sidebar_footer_frame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
diff -Nru ubiquity-2.18.6/scripts/localechooser-apply ubiquity-2.18.7/scripts/localechooser-apply
--- ubiquity-2.18.6/scripts/localechooser-apply	2013-04-18 16:34:10.000000000 +0000
+++ ubiquity-2.18.7/scripts/localechooser-apply	2014-04-16 10:20:29.000000000 +0000
@@ -199,6 +199,7 @@
 		LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION; do
 		set_field /etc/default/locale "$category" "$LOCALE"
 	done
+	mkdir -p "/usr/share/locale-langpack/${LOCALE%_*}"
 	/usr/sbin/locale-gen --no-purge "$LOCALE" || true
 fi
 
@@ -209,6 +210,7 @@
 LANGCODE="${LOCALE_TRANSLATIONS%%_*}"
 LANGCODE="${LANGCODE%%.*}"
 LANGCODE="${LANGCODE%%@*}"
+mkdir -p "/usr/share/locale-langpack/${LANGCODE%_*}"
 /usr/share/locales/install-language-pack "$LANGCODE" '' || true
 
 # TODO: kbd/cyr handling?