diff --git a/completions/ncftp b/completions/ncftp
index 57347e0e..0d32cfe2 100644
--- a/completions/ncftp
+++ b/completions/ncftp
@@ -5,6 +5,17 @@ _ncftp()
     local cur prev words cword
     _init_completion || return
 
+    case $prev in
+        -u|-p|-P|-j|-F)
+            return
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" -h )' -- "$cur" ) )
+        return
+    fi
+
     if [[ $cword -eq 1 && -f ~/.ncftp/bookmarks ]]; then
         COMPREPLY=( $( compgen -W '$( sed -ne "s/^\([^,]\{1,\}\),.*$/\1/p" \
             ~/.ncftp/bookmarks )' -- "$cur" ) )
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
index 52d70756..d6683b86 100644
--- a/test/lib/completions/ncftp.exp
+++ b/test/lib/completions/ncftp.exp
@@ -12,8 +12,10 @@ setup
 
 
 assert_complete_any "ncftp "
+sync_after_int
 
 
+assert_complete_any "ncftp -"
 sync_after_int