diff --git a/common.inc b/common.inc
index e8106e1..4d37ccd 100644
--- a/common.inc
+++ b/common.inc
@@ -488,13 +488,25 @@
     pop
   } { pop } ifelse
   "hidden-timeout" getgfxconfig dup .undef ne {
-    % display just the main and access logos and wait for a keypress; if
-    % timeout expires, boot without showing the menu
-    pop /timeout.hidden true def
+    % If >= 1, display just the main and access logos and wait for a
+    % keypress; if timeout expires, boot without showing the menu.
+    % If >= 2, as above, but don't display the splash image (hack for
+    % Ubuntu 10.04 LTS, so please don't rely on it permanently).
+    strtol
+    dup 1 ge { /timeout.hidden true def } if
+    2 ge { /timeout.hidden.showsplash false def } if
   } { pop } ifelse
 
   menu.bar.color setcolor 0 0 moveto screen.size fillrect
 
+  % Hack for Ubuntu 10.04 LTS.  Should be replaced by better logo handling
+  % in general.
+  timeout.hidden.showsplash not {
+    /background.file.orig background.file def
+    "blank.pcx" findfile
+    /background.file over def setimage
+  } if
+
   % Move the logo down 84 pixels to centre it.  This is obviously a gross
   % hack.  To fix this, we need to move to smaller logo images which are
   % positioned on the screen in code, rather than doing the positioning in
diff --git a/debian/changelog b/debian/changelog
index 3e8aaf8..96d32f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 gfxboot-theme-ubuntu (0.9.9) UNRELEASED; urgency=low
 
   * Update translations from Launchpad.
+  * If hidden-timeout=2 is set in gfxboot.cfg, then only show access.pcx at
+    the bottom of the screen, not the logo as well, to alleviate problems
+    caused by aspect ratio distortion.  For awkward internal reasons this
+    currently requires a blank.pcx to exist that has the same dimensions as
+    splash.pcx but is just a blank screen of the appropriate colour.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Apr 2010 00:46:39 +0100
 
diff --git a/splash.inc b/splash.inc
index ea6ea3e..af5746d 100644
--- a/splash.inc
+++ b/splash.inc
@@ -58,6 +58,7 @@
 %
 /splash.input {
   /timeout.hidden false def
+  /background.file background.file.orig def
   0 0 moveto background.file setimage 0 0 image.size image
   window.done
   window.main
diff --git a/timeout.inc b/timeout.inc
index 7589a37..b7c9054 100644
--- a/timeout.inc
+++ b/timeout.inc
@@ -45,3 +45,4 @@
 /timeout.y { head.y } def
 
 /timeout.hidden false def
+/timeout.hidden.showsplash true def