diff --git a/Makefile b/Makefile
index 32be8886..13eb23a0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ ponythinkcompletion:
 	sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh"   | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh"
 
 submodules:
+	git submodule init
 	git submodule update
 	(cd "ponyquotes4ponysay/"; make -B)
 
diff --git a/manuals/manpage.6 b/manuals/manpage.6
index 5f8c839e..a242fb13 100644
--- a/manuals/manpage.6
+++ b/manuals/manpage.6
@@ -20,10 +20,12 @@ ponysay \- A cowsay wrapper with ponies
 .SH SYNOPSIS
 .B ponysay
 .RI [ options ]
+[--]
 .RI [ message ]
 .br
 .B ponythink
 .RI [ options ]
+[--]
 .RI [ message ]
 .br
 .SH DESCRIPTION
diff --git a/manuals/manpage.es.6 b/manuals/manpage.es.6
index 6f9e1eb8..c6102bb1 100644
--- a/manuals/manpage.es.6
+++ b/manuals/manpage.es.6
@@ -20,10 +20,12 @@ ponysay \- un contenedor para cowsay usando ponis
 .SH SINOPSIS
 .B ponysay
 .RI [ opciones ]
+[--]
 .RI [ mensaje ]
 .br
 .B ponythink
 .RI [ opciones ]
+[--]
 .RI [ mensaje ]
 .br
 .SH DESCRIPCIÓN
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 0a84da79..0ea797b8 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -96,8 +96,8 @@ is printed on standard output.
 The format for running the @command{ponysay} program is:
 
 @example
-ponysay [@var{option}@dots{}] [@var{message}]
-ponythink [@var{option}@dots{}] [@var{message}]
+ponysay [@var{option}@dots{}] [--] [@var{message}]
+ponythink [@var{option}@dots{}] [--] [@var{message}]
 @end example
 
 Running @command{ponysay} will print a speech balloon,
@@ -108,6 +108,9 @@ Otherwise @command{ponysay} and @command{ponythink} is the same thing.
 
 @table @option
 
+@item --
+Parse the following arguments as parts of @code{@var{message}}.
+
 @item -h
 Show summary of options.
 
@@ -172,6 +175,7 @@ by hand, you can run @code{cat | ponysay}.
 @node Fortune cookies
 @section Fortune cookies
 @cindex fortune
+@cindex startup
 @cindex on startup
 
 If you have @command{fortune} installed -- this program may be named
@@ -315,6 +319,9 @@ extension @command{kmsponies4ponysay}.
 @cindex kernel mode settings
 @cindex 9term
 @cindex putty
+@cindex terminals
+@cindex fonts
+@cindex broken ponies
 
 Ponysay works perfectly on @command{xterm}, @command{xterm} like terminals including
 @command{putty}, settings may however need to be customised for Unicode Character Set
diff --git a/ponysay.pdf b/ponysay.pdf
index 6dc86b4f..bee25340 100644
Binary files a/ponysay.pdf and b/ponysay.pdf differ