diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml
index acd925c46..78ca6a7b4 100644
--- a/ipc/codegen/Cargo.toml
+++ b/ipc/codegen/Cargo.toml
@@ -14,8 +14,8 @@ nightly-testing = ["clippy"]
 with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
 
 [build-dependencies]
-quasi_codegen = { version = "*", optional = true }
-syntex = { version = "*", optional = true }
+quasi_codegen = { version = "0.10", optional = true }
+syntex = { version = "^0.31", optional = true }
 
 [dependencies]
 aster = { version = "0.16", default-features = false }
diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs
index 582aa9332..6f16994b6 100644
--- a/ipc/codegen/src/codegen.rs
+++ b/ipc/codegen/src/codegen.rs
@@ -197,14 +197,14 @@ fn implement_dispatch_arm_invoke_stmt(
 			let mut tt = ::std::vec::Vec::new();
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep));
-			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc"), ::syntax::parse::token::ModName)));
+			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc"))));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep));
-			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary"), ::syntax::parse::token::ModName)));
+			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary"))));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep));
-			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize"), ::syntax::parse::token::Plain)));
+			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize"))));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
-			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"), ::syntax::parse::token::Plain)));
+			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"))));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot));
 			tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter());
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
@@ -217,7 +217,7 @@ fn implement_dispatch_arm_invoke_stmt(
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot));
-			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap"), ::syntax::parse::token::Plain)));
+			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap"))));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
 			tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace)));
@@ -365,18 +365,18 @@ fn implement_client_method_body(
 				{
 					let _sp = ext_cx.call_site();
 					let mut tt = ::std::vec::Vec::new();
-					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let"), ::syntax::parse::token::Plain)));
-					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload"), ::syntax::parse::token::Plain)));
+					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let"))));
+					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload"))));
 					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Eq));
-					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request"), ::syntax::parse::token::Plain)));
+					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request"))));
 					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace)));
 
 					for arg in dispatch.input_arg_names.iter() {
-						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()), ::syntax::parse::token::Plain)));
+						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()))));
 						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon));
 						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
 
-						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()), ::syntax::parse::token::Plain)));
+						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()))));
 						tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma));
 					}
 
@@ -452,18 +452,18 @@ fn implement_client_method(
 			{
 				let _sp = ext_cx.call_site();
 				let mut tt = ::std::vec::Vec::new();
-				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn"), ::syntax::parse::token::Plain)));
+				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn"))));
 				tt.extend(::quasi::ToTokens::to_tokens(&method_name, ext_cx).into_iter());
 				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
 				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
-				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"), ::syntax::parse::token::Plain)));
+				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"))));
 				tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma));
 
 				for arg_idx in 0..dispatch.input_arg_names.len() {
 					let arg_name = dispatch.input_arg_names[arg_idx].as_str();
 					let arg_ty = dispatch.input_arg_tys[arg_idx].clone();
 
-					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name), ::syntax::parse::token::Plain)));
+					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name))));
 					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon));
 					tt.extend(::quasi::ToTokens::to_tokens(&arg_ty, ext_cx).into_iter());
 					tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma));
diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs
index 3f535aafc..6a9784790 100644
--- a/ipc/codegen/src/serialization.rs
+++ b/ipc/codegen/src/serialization.rs
@@ -372,47 +372,47 @@ fn fields_sequence(
 		{
 			let _sp = ext_cx.call_site();
 			let mut tt = ::std::vec::Vec::new();
-			tt.push(Token(_sp, token::Ident(variant_ident.clone(), token::Plain)));
+			tt.push(Token(_sp, token::Ident(variant_ident.clone())));
 			tt.push(Token(_sp, token::OpenDelim(token::Paren)));
 
 			for (idx, field) in fields.iter().enumerate() {
 				if field.ident.is_some() {
-					tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap(), token::Plain)));
+					tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap())));
 					tt.push(Token(_sp, token::Colon));
 				}
 
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(
-					_sp,
-					token::Ident(
-						ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))),
-						token::Plain)));
+				tt.push(
+					Token(
+						_sp,
+						token::Ident(ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))))
+					));
 				tt.push(Token(_sp, token::ModSep));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
 
 				tt.push(Token(_sp, token::BinOp(token::And)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
 
 				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
 				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 				tt.push(Token(_sp, token::DotDot));
 
 				if idx+1 != fields.len() {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
+					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
 					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain)));
+					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
 					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 				}
 
 				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 
 				tt.push(Token(_sp, token::Comma));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"))));
 
 				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
 				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
@@ -439,53 +439,53 @@ fn named_fields_sequence(
 		{
 			let _sp = ext_cx.call_site();
 			let mut tt = ::std::vec::Vec::new();
-			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let"), token::Plain)));
-			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result"), token::Plain)));
+			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let"))));
+			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result"))));
 			tt.push(Token(_sp, token::Eq));
 
 			tt.push(Token(
 				_sp,
 			  	token::Ident(
-					ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty)),
-			 		token::Plain)));
+					ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty))
+			 		)));
 
 			tt.push(Token(_sp, token::OpenDelim(token::Brace)));
 
 			for (idx, field) in fields.iter().enumerate() {
-				tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap(), token::Plain)));
+				tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap())));
 				tt.push(Token(_sp, token::Colon));
 
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
 				tt.push(Token(
 					_sp,
 					token::Ident(
-						ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))),
-						token::Plain)));
+						ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty)))
+						)));
 				tt.push(Token(_sp, token::ModSep));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
 
 				tt.push(Token(_sp, token::BinOp(token::And)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
 
 				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
 				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
 				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 				tt.push(Token(_sp, token::DotDot));
 				if idx + 1 != fields.len() {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
+					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
 					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain)));
+					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
 					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 				}
 
 				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
 
 				tt.push(Token(_sp, token::Comma));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"), token::Plain)));
+				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"))));
 
 
 				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml
index fb68adeb7..32f0b2b26 100644
--- a/ipc/nano/Cargo.toml
+++ b/ipc/nano/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 [features]
 
 [dependencies]
-jsonrpc-core = "2.0"
+jsonrpc-core = { git = "https://github.com/tomusdrw/jsonrpc-core.git" }
 "ethcore-ipc" = { path = "../rpc" }
 nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
 log = "0.3"
diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs
index 3600ed7b9..da5d939f2 100644
--- a/ipc/tests/build.rs
+++ b/ipc/tests/build.rs
@@ -16,7 +16,6 @@
 
 extern crate syntex;
 extern crate ethcore_ipc_codegen as codegen;
-extern crate serde_codegen;
 
 use std::env;
 use std::path::Path;
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 7f714b32d..5c2b19a52 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -27,7 +27,7 @@ json-ipc-server = { git = "https://github.com/NikVolf/json-ipc-server.git" }
 
 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }
-syntex = "0.32.0"
+syntex = "^0.31.0"
 
 [features]
 default = ["serde_codegen"]