diff --git a/completion/ponysay b/completion/ponysay
index 9ccd8428..27efad81 100644
--- a/completion/ponysay
+++ b/completion/ponysay
@@ -26,6 +26,8 @@
 		((options +f ++file ++pony)                             (complete ++file ++pony) (arg PONY)    (suggest pony+f)  (files -f *.pony)  (desc 'Specify the extrapony that should printed'))
 		((options -F --anyfile --any-file --anypony --any-pony) (complete --any-pony)    (arg PONY)    (suggest pony-F)  (files -f *.pony)  (desc 'Specify the [extra]pony that should printed'))
 		((options -q --quote)                                   (complete --quote)       (arg PONY)    (suggest pony-q)  (files -f *.pony)  (desc 'Specify the pony that should quote herself'))
+		((options +q ++quote)                                   (complete ++quote)       (arg PONY)    (suggest pony+q)  (files -f *.pony)  (desc 'Specify the extrapony that should quote herself'))
+		((options -Q --anyquote, --any-quote)                   (complete --any-quote)   (arg PONY)    (suggest pony-Q)  (files -f *.pony)  (desc 'Specify the [extra]pony that should quote herself'))
 		((options -b --bubble --balloon)                        (complete --balloon)     (arg STYLE)   (suggest balloon) (files -f (case (ponysay *.say) (ponyhink *.think)))  (desc 'Specify message balloon style'))
 		((options -W --wrap)                                    (complete --wrap)        (arg COLUMN)  (suggest wrap)    (files -0)         (desc 'Specify wrapping column'))
 		((options +c --colour)                                  (complete --colour)      (arg ANSI-COLOUR)               (files -0)         (desc 'Specify colour of the balloon, balloon link and message'))
@@ -42,6 +44,8 @@
 	(variadic (options ++f ++files ++ponies)                                (bind +f) (desc 'Specify the extraponies that may be printed'))
 	(variadic (options --F --anyfiles --any-files --anyponies --any-ponies) (bind -F) (desc 'Specify the [extra]ponies that may be printed'))
 	(variadic (options --q --quotes)                                        (bind -q) (desc 'Specify the pony that may quote themself'))
+	(variadic (options ++q ++quotes)                                        (bind +q) (desc 'Specify the extrapony that may quote themself'))
+	(variadic (options --Q --anyquotes, --any-quotes)                       (bind -Q) (desc 'Specify the [extra}pony that may quote themself'))
 	
 	(suggestion message (verbatim MESSAGE)
 	)
@@ -57,6 +61,12 @@
 	(suggestion pony-q  (exec "'/usr/bin/ponysay'" --quoters)
 		    	    (no-exec ls "'/usr/share/ponysay/ponies'" .pony)
 	)
+	(suggestion pony+q  (exec "'/usr/bin/ponysay'" ++quoters)
+		    	    (no-exec ls "'/usr/share/ponysay/ponies'" .pony)
+	)
+	(suggestion pony-Q  (exec "'/usr/bin/ponysay'" --Quoters)
+		    	    (no-exec ls "'/usr/share/ponysay/ponies'" .pony)
+	)
 	(suggestion balloon (exec "'/usr/bin/ponysay'" --balloonlist)
 		    	    (no-exec ls "'/usr/share/ponysay/balloons'" (case (ponysay .say) (ponythink .think)))
 	)