diff --git a/debian/changelog b/debian/changelog
index 1fe9ddf0c..c0857a47c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ cmake (2.8.0-3) UNRELEASED; urgency=low
   * Set HOME to current build directory when running test suite. This should
     fix failures of kwsys.testRegistry and FindPackageTest tests on the
     buildds.
+  * Increase timeout of BootstrapTest to 2 hours so it no longer times out
+    on s390 or armel (patch bootstraptest_increase_timeout.diff).
 
  -- Modestas Vainius <modestas@vainius.eu>  Sun, 22 Nov 2009 20:05:59 +0200
 
diff --git a/debian/patches/bootstraptest_increase_timeout.diff b/debian/patches/bootstraptest_increase_timeout.diff
new file mode 100644
index 000000000..069e08d6a
--- /dev/null
+++ b/debian/patches/bootstraptest_increase_timeout.diff
@@ -0,0 +1,17 @@
+From: Modestas Vainius <modestas@vainius.eu>
+Subject: increase time out for BootstrapTest to 2 hours
+ Default time out of 25 minutes (1500 seconds) is not enough on slow
+ and embedded systems (e.g. armel, s390).
+Bug: http://public.kitware.com/Bug/view.php?id=9950
+Forwarded: not-needed
+
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -1372,6 +1372,7 @@
+       --build-noclean
+       --build-makeprogram ${CMake_SOURCE_DIR}/bootstrap
+       --build-generator "${CMAKE_TEST_GENERATOR}"
++      --test-timeout 7200
+       --test-command 
+       ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
+     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..09797728d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bootstraptest_increase_timeout.diff