diff --git a/share/completions/cygpath.fish b/share/completions/cygpath.fish
new file mode 100644
index 000000000..2a7a8d696
--- /dev/null
+++ b/share/completions/cygpath.fish
@@ -0,0 +1,26 @@
+complete -c cygpath -s d -l dos -d 'Print DOS/short form (C:PROGRA~1)'
+complete -c cygpath -s m -l mixed -d 'Print Windows form with regular slashes (C:/WINNT)'
+complete -c cygpath -s M -l mode -d 'Report on mode of file'
+complete -c cygpath -s u -l unix -d 'Print Unix form (/cygdrive/c/winnt)'
+complete -c cygpath -s w -l windows -d 'Print Windows form (C:\\WINNT)'
+complete -c cygpath -s t -l type -a 'dos mixed unix windows' -d 'Print TYPE form'
+complete -c cygpath -s a -l absolute -d 'Output absolute path'
+complete -c cygpath -s l -l long-name -d 'Print Windows long form' -n '__fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s p -l path -d 'NAME is a colon-separated list'
+complete -c cygpath -s U -l proc-cygdrive -d 'Emit /proc/cygdrive instead of /cygdrive prefix'
+complete -c cygpath -s s -l short-name -d 'Print DOS/short form' -n '__fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s C -l codepage -r -a 'ANSI OEM UTF8' -d 'Print pathname in CODEPAGE' -n '__fish_seen_argument -s d -l dos; or __fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s A -l allusers -d 'Use "All Users" instead of current user' -n '__fish_seen_argument -s D -l desktop; or __fish_seen_argument -s O -l mydocs; or __fish_seen_argument -s P -l smprograms'
+complete -c cygpath -s D -l desktop -d 'Output "Desktop" directory'
+complete -c cygpath -s H -l homeroot -d 'Output "Profiles" directory'
+complete -c cygpath -s O -l mydocs -d 'Output "My Documents" directory'
+complete -c cygpath -s P -l smprograms -d 'Output Start Menu "Programs" directory'
+complete -c cygpath -s S -l sysdir -d 'Output system directory'
+complete -c cygpath -s W -l windir -d 'Output "Windows" directory'
+complete -c cygpath -s F -l folder -x -d 'Output special folder with numeric ID'
+complete -c cygpath -s f -l file -r -d 'Read FILE for input'
+complete -c cygpath -s o -l option -d 'Read options from FILE as well' -n '__fish_seen_argument -s f -l file'
+complete -c cygpath -s c -l close -x -d 'Close HANDLE'
+complete -c cygpath -s i -l ignore -d 'Ignore missing argument'
+complete -c cygpath -s h -l help -d 'Output usage information'
+complete -c cygpath -s V -l version -d 'Output version information'
diff --git a/share/completions/cygstart.fish b/share/completions/cygstart.fish
new file mode 100644
index 000000000..8e04e3d58
--- /dev/null
+++ b/share/completions/cygstart.fish
@@ -0,0 +1,25 @@
+complete -c cygstart -s a -l action -r -a 'open explore edit find print' -d 'Use specified action instead of default'
+complete -c cygstart -s o -l open -d 'Short for: --action open'
+complete -c cygstart -s x -l explore -d 'Short for: --action explore'
+complete -c cygstart -s e -l edit -d 'Short for: --action edit'
+complete -c cygstart -s f -l find -d 'Short for: --action find'
+complete -c cygstart -s p -l print -d 'Short for: --action print'
+complete -c cygstart -s d -l directory -r -d 'Set working directory'
+complete -c cygstart -l hide -d 'Hide window and activates another window'
+complete -c cygstart -l maximize -d 'Maximize the specified window'
+complete -c cygstart -l minimize -d 'Minimize the specified window'
+complete -c cygstart -l restore -d 'Activate and display window'
+complete -c cygstart -l show -d 'Activate window and display in current size and position'
+complete -c cygstart -l showmaximized -d 'Activate and maximize window'
+complete -c cygstart -l showminimized -d 'Activate and minimize window'
+complete -c cygstart -l showminnoactive -d 'Display window minimized'
+complete -c cygstart -l showna -d 'Display window in current state'
+complete -c cygstart -l shownoactivate -d 'Display a window in most recent size and position'
+complete -c cygstart -l shownormal -d 'Activate and display a window'
+complete -c cygstart -s w -l wait -d 'Wait until the application terminates before exiting'
+complete -c cygstart -s v -l verbose -d 'Show the actual ShellExecute call made'
+complete -c cygstart -s '?' -l help -d 'Show this help message'
+complete -c cygstart -l usage -d 'Display brief usage message'
+complete -c cygstart -l version -d 'Display version information'
+complete -c cygstart -l license -d 'Display licensing information'
+complete -c cygstart -l reference -d 'Open MSDN reference for ShellExecute'