diff --git a/README.rst b/README.rst
index 58e9d59..5390d57 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ Archive repository with all its submodules.
 
 ::
 
-    git-archive-all [-v] [-C BASE_REPO] [--prefix PREFIX] [--no-exclude] [--force-submodules] [--extra EXTRA1 ...] [--dry-run] [-0 | ... | -9] OUTPUT_FILE
+    git-archive-all [-v] [-C BASE_REPO] [--prefix PREFIX] [--no-export-ignore] [--force-submodules] [--include EXTRA1 ...] [--dry-run] [-0 | ... | -9] OUTPUT_FILE
 
     Options:
 
@@ -37,12 +37,12 @@ Archive repository with all its submodules.
       -C BASE_REPO          use BASE_REPO as the main git repository to archive;
                             defaults to the current directory when empty
 
-      --no-exclude          ignore the [-]export-ignore attribute in .gitattributes
+      --no-export-ignore    ignore the [-]export-ignore attribute in .gitattributes
 
       --force-submodules    force `git submodule init && git submodule update` at
                             each level before iterating submodules
 
-      --extra=EXTRA         additional files to include in the archive
+      --include=EXTRA         additional files to include in the archive
 
       --dry-run             show files to be archived without actually creating the archive
 
diff --git a/git_archive_all.py b/git_archive_all.py
index 8a727dd..c20bb09 100755
--- a/git_archive_all.py
+++ b/git_archive_all.py
@@ -559,8 +559,8 @@ def main(argv=None):
     from optparse import OptionParser, SUPPRESS_HELP
 
     parser = OptionParser(
-        usage="usage: %prog [-v] [-C BASE_REPO] [--prefix PREFIX] [--no-exclude]"
-              " [--force-submodules] [--extra EXTRA1 ...] [--dry-run] [-0 | ... | -9] OUTPUT_FILE",
+        usage="usage: %prog [-v] [-C BASE_REPO] [--prefix PREFIX] [--no-export-ignore]"
+              " [--force-submodules] [--include EXTRA1 ...] [--dry-run] [-0 | ... | -9] OUTPUT_FILE",
         version="%prog {0}".format(__version__)
     )
 
@@ -583,7 +583,7 @@ def main(argv=None):
                       dest='verbose',
                       help='enable verbose mode')
 
-    parser.add_option('--no-exclude',
+    parser.add_option('--no-export-ignore', '--no-exclude',
                       action='store_false',
                       dest='exclude',
                       default=True,
@@ -594,7 +594,7 @@ def main(argv=None):
                       dest='force_sub',
                       help='force `git submodule init && git submodule update` at each level before iterating submodules')
 
-    parser.add_option('--extra',
+    parser.add_option('--include', '--extra',
                       action='append',
                       dest='extra',
                       default=[],