diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index 571a50d..020b73a 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -107,6 +107,47 @@ static const string HTMLDiv = " \
 <div id=\"topbar\"><form method=\"GET\" action=\"/search\"><input type=\"textbox\" name=\"pattern\" /><input type=\"submit\" value=\"Search\" /></form></div> \n \
 ";
 
+// Urlencode
+
+//based on javascript encodeURIComponent()
+
+string char2hex( char dec )
+{
+  char dig1 = (dec&0xF0)>>4;
+  char dig2 = (dec&0x0F);
+  if ( 0<= dig1 && dig1<= 9) dig1+=48;    //0,48inascii
+  if (10<= dig1 && dig1<=15) dig1+=97-10; //a,97inascii
+  if ( 0<= dig2 && dig2<= 9) dig2+=48;
+  if (10<= dig2 && dig2<=15) dig2+=97-10;
+
+  string r;
+  r.append( &dig1, 1);
+  r.append( &dig2, 1);
+  return r;
+}
+
+string urlEncode(const string &c) {
+  string escaped="";
+  int max = c.length();
+  for(int i=0; i<max; i++)
+    {
+      if ( (48 <= c[i] && c[i] <= 57) ||//0-9
+	   (65 <= c[i] && c[i] <= 90) ||//abc...xyz
+	   (97 <= c[i] && c[i] <= 122) || //ABC...XYZ
+	   (c[i]=='~' || c[i]=='!' || c[i]=='*' || c[i]=='(' || c[i]==')' || c[i]=='\'')
+	   )
+        {
+	  escaped.append( &c[i], 1);
+        }
+      else
+        {
+	  escaped.append("%");
+	  escaped.append( char2hex(c[i]) );//converts char 255 to string "ff"
+        }
+    }
+  return escaped;
+}
+
 static bool verboseFlag = false;
 static kiwix::Reader* reader;
 static kiwix::Searcher* searcher;
@@ -179,7 +220,7 @@ static int accessHandlerCallback(void *cls,
       content = "<html><head><title>Kiwix search results</title></head><body><h1>Results</h1><hr/><ol>\n";
       while (searcher->getNextResult(urlStr, titleStr, scoreInt)) {
 	sprintf(scoreStr, "%d", scoreInt);
-	content += "<li><a href=\"" + urlStr + "\">" + titleStr+ "</a> - " + scoreStr + "%</li>\n";
+	content += "<li><a href=\"" + urlEncode(urlStr) + "\">" + titleStr+ "</a> - " + scoreStr + "%</li>\n";
 	
       }
     } catch (const std::exception& e) {
