diff --git a/doc/latex2sphinx/_static/insertIframe.js b/doc/latex2sphinx/_static/insertIframe.js
index 68df739a5e..904ff361de 100644
--- a/doc/latex2sphinx/_static/insertIframe.js
+++ b/doc/latex2sphinx/_static/insertIframe.js
@@ -3,7 +3,7 @@ function insertIframe (elementId, iframeSrc)
   var iframe;
   if (document.createElement && (iframe = document.createElement('iframe')))
   {
-    iframe.src = iframeSrc;
+    iframe.src = unescape(iframeSrc);
     iframe.width = "100%";
     iframe.height = "511px";
     var element = document.getElementById(elementId);
@@ -11,7 +11,3 @@ function insertIframe (elementId, iframeSrc)
   }
 }
 
-
-
-
-
diff --git a/doc/latex2sphinx/latex.py b/doc/latex2sphinx/latex.py
index fde1dfe442..3377acfb69 100644
--- a/doc/latex2sphinx/latex.py
+++ b/doc/latex2sphinx/latex.py
@@ -8,6 +8,7 @@ import StringIO
 from qfile import QOpen
 from string import Template
 from random import random
+import urllib
 
 # useful things for pyparsing
 def returnList(x):
@@ -153,8 +154,8 @@ class SphinxWriter:
 		self.cur_module = self.render(c.params[1].str)
 
     def wikiLink(self, name):
-        return '`id=%s Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/%s/%s/%s>`__' % (random(), self.language, self.cur_module, name)
-	
+        return '`id=%s Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/%s/%s/%s>`__' % (random(), self.language, self.cur_module, urllib.quote(name) )
+
     def cmd_cvCppCross(self, c):
         self.write(":func:`%s`" % str(c.params[0]))