diff --git a/debian/changelog b/debian/changelog
index 06349d0..69ed718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low
   * mk-sbuild: Support kmod, when checking for overlayfs availability.
   * pbuilder-dist: improve bash_completion for *.dsc files. Thanks Maarten
     Bezemer. (Closes: #670924, LP: #770529)
-  * submittodebian, check-mir, check-symbols: Do enough argument parsing to
-    handle --help (LP: #988009)
+  * submittodebian, check-mir, check-symbols, ubuntu-iso: Do enough argument
+    parsing to handle --help (LP: #988009)
 
  -- Stefano Rivera <stefanor@debian.org>  Wed, 25 Apr 2012 17:38:58 +0200
 
diff --git a/ubuntu-iso b/ubuntu-iso
index 5c1309d..04a2e30 100755
--- a/ubuntu-iso
+++ b/ubuntu-iso
@@ -20,6 +20,7 @@
 #
 # ##################################################################
 
+import optparse
 import sys
 
 from ubuntutools import subprocess
@@ -37,7 +38,10 @@ def extract(iso, path):
     return stdout
 
 def main():
-    isos = sys.argv[1:]
+    parser = optparse.OptionParser(usage='%prog [options] iso...',
+            description='Given an ISO, %prog will display the Ubuntu version '
+                        'information')
+    isos = parser.parse_args()[1]
     err = False
 
     for iso in isos:
diff --git a/ubuntutools/test/test_help.py b/ubuntutools/test/test_help.py
index e3af9ba..3e8f2ee 100644
--- a/ubuntutools/test/test_help.py
+++ b/ubuntutools/test/test_help.py
@@ -28,7 +28,6 @@ BLACKLIST = {
     'grep-merges': 'No Help',
     'pbuilder-dist-simple': 'No Help',
     'setup-packaging-environment': 'Throws Error',
-    'ubuntu-iso': 'No Help',
 }
 TIMEOUT = 5