diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index aa55ed6b09..8ad837b7f0 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -12,16 +12,13 @@ PENDING/*
 TAGS
 Twisted-1.3.0
 Twisted-1.3.0.tar.gz
-docs/interface.aux
-docs/interface.log
-docs/interface.pdf
-docs/interface.ps
-docs/interface.toc
-docs/user.aux
-docs/user.log
-docs/user.pdf
-docs/user.ps
-docs/user.toc
+docs/*.aux
+docs/*.log
+docs/*.pdf
+docs/*.ps
+docs/*.toc
+docs/interface/*
+docs/user/*
 extras/mini-os/h/hypervisor-ifs
 install
 install/*
diff --git a/tools/python/xen/xm/opts.py b/tools/python/xen/xm/opts.py
index 4523775b65..9f34b6773c 100644
--- a/tools/python/xen/xm/opts.py
+++ b/tools/python/xen/xm/opts.py
@@ -273,10 +273,19 @@ class Opts:
         return remaining arguments
         """
         self.argv = argv
+
         try:
             (vals, args) = getopt(argv[1:], self.short_opts(), self.long_opts())
         except GetoptError, err:
             self.err(str(err))
+
+	# hack to work around lack of gnu getopts parsing in python 2.2
+	xargs = args
+	while xargs[1:]:
+	    (v,xargs) = getopt(xargs[1:], self.short_opts(), self.long_opts())
+	    vals = vals + v
+
+	# back to the real work
         self.args = args
         for (k, v) in vals:
             for opt in self.options: