diff --git a/bin/ans-playbook b/bin/ans-playbook
index 87136ebc63..dd4999d567 100755
--- a/bin/ans-playbook
+++ b/bin/ans-playbook
@@ -27,7 +27,7 @@ def main(args):
     parser.usage = "ans-playbook playbook.yml ..."
     parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int',
         help='set the number of forks to start up')
-    parser.add_option("-L", "--library", dest="module_path",
+    parser.add_option("-m", "--module-path", dest="module_path",
         help="path to module library", default=C.DEFAULT_MODULE_PATH)
     options, args = parser.parse_args(args)
 
diff --git a/lib/ansible/scripts.py b/lib/ansible/scripts.py
index b6c5ad2bfa..062b0fa029 100644
--- a/lib/ansible/scripts.py
+++ b/lib/ansible/scripts.py
@@ -28,7 +28,7 @@ def base_ans_parser():
         dest='remote_user', help='set the default username')
     parser.add_option("-p", "--pattern", dest="pattern",
         help="hostname pattern", default=C.DEFAULT_PATTERN)
-    parser.add_option("-k", "--askpass", default=False, action="store_true",
+    parser.add_option("-k", "--ask-pass", default=False, action="store_true",
         help="ask the user to input the ssh password for connecting")
     parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int',
         help='set the number of forks to start up')