diff --git a/src/Symfony/Component/Intl/Resources/bin/update-icu-component.php b/src/Symfony/Component/Intl/Resources/bin/update-icu-component.php
index 93c3e8f5f4..2b94fe417f 100644
--- a/src/Symfony/Component/Intl/Resources/bin/update-icu-component.php
+++ b/src/Symfony/Component/Intl/Resources/bin/update-icu-component.php
@@ -24,7 +24,7 @@ use Symfony\Component\Filesystem\Filesystem;
 require_once __DIR__ . '/common.php';
 require_once __DIR__ . '/autoload.php';
 
-if ($GLOBALS['argc'] > 3) {
+if ($GLOBALS['argc'] > 3 || 2 === $GLOBALS['argc'] && '-h' === $GLOBALS['argv'][1]) {
     bailout(<<<MESSAGE
 Usage: php update-icu-component.php <path/to/icu/source> <path/to/icu/build>
 
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-stubs.php b/src/Symfony/Component/Intl/Resources/bin/update-stubs.php
index a99fe6fde9..bfc917693f 100644
--- a/src/Symfony/Component/Intl/Resources/bin/update-stubs.php
+++ b/src/Symfony/Component/Intl/Resources/bin/update-stubs.php
@@ -61,6 +61,11 @@ if ($shortIcuVersionInIntlComponent !== $shortIcuVersionInIcuComponent) {
     bailout("The ICU version of the component ($shortIcuVersionInIcuComponent) does not match the ICU version of the stub classes in the Intl component ($shortIcuVersionInIntlComponent).");
 }
 
+echo wordwrap("Make sure that you don't have any ICU development files " .
+    "installed. If the build fails, try to run:\n", LINE_WIDTH);
+
+echo "\n    sudo apt-get remove libicu-dev\n\n";
+
 $icuVersionInIcuComponent = IcuData::getVersion();
 
 echo "Compiling stubs for ICU version $icuVersionInIcuComponent.\n";