diff --git a/src/HttpReq.cpp b/src/HttpReq.cpp
index 106192109..4cd4a46ec 100644
--- a/src/HttpReq.cpp
+++ b/src/HttpReq.cpp
@@ -5,6 +5,28 @@
 
 boost::asio::io_service HttpReq::io_service;
 
+std::string HttpReq::urlEncode(const std::string &s)
+{
+    const std::string unreserved = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~";
+
+    std::string escaped="";
+    for(size_t i=0; i<s.length(); i++)
+    {
+        if (unreserved.find_first_of(s[i]) != std::string::npos)
+        {
+            escaped.push_back(s[i]);
+        }
+        else
+        {
+            escaped.append("%");
+            char buf[3];
+            sprintf(buf, "%.2X", s[i]);
+            escaped.append(buf);
+        }
+    }
+    return escaped;
+}
+
 HttpReq::HttpReq(const std::string& server, const std::string& path)
 	: mResolver(io_service), mSocket(io_service), mStatus(REQ_IN_PROGRESS)
 {
diff --git a/src/HttpReq.h b/src/HttpReq.h
index 31d368540..14181ace4 100644
--- a/src/HttpReq.h
+++ b/src/HttpReq.h
@@ -47,6 +47,8 @@ public:
 
 	std::string getContent();
 
+	static std::string urlEncode(const std::string &s);
+
 private:
 	static boost::asio::io_service io_service;
 
diff --git a/src/scrapers/GamesDBScraper.cpp b/src/scrapers/GamesDBScraper.cpp
index fc018493c..7e60038d3 100644
--- a/src/scrapers/GamesDBScraper.cpp
+++ b/src/scrapers/GamesDBScraper.cpp
@@ -20,7 +20,7 @@ std::shared_ptr<HttpReq> GamesDBScraper::makeHttpReq(ScraperSearchParams params)
 	if(cleanName.empty())
 		cleanName = params.game->getCleanName();
 	
-	path += "name=" + cleanName;
+	path += "name=" + HttpReq::urlEncode(cleanName);
 	//platform TODO, should use some params.system get method
 
 	return std::make_shared<HttpReq>("thegamesdb.net", path);