diff --git a/plugins/router_basicauth/router_basicauth.c b/plugins/router_basicauth/router_basicauth.c
index 9d3ddc80..d696b9e9 100644
--- a/plugins/router_basicauth/router_basicauth.c
+++ b/plugins/router_basicauth/router_basicauth.c
@@ -235,7 +235,7 @@ void router_basicauth_register(void) {
 
 struct uwsgi_plugin router_basicauth_plugin = {
 
-	.name = "router_redirect",
+	.name = "router_basicauth",
 	.on_load = router_basicauth_register,
 #ifndef __linux__
 	.enable_threads = router_basicauth_init_lock,
diff --git a/plugins/router_redirect/router_redirect.c b/plugins/router_redirect/router_redirect.c
index 9b2956eb..94419bcc 100644
--- a/plugins/router_redirect/router_redirect.c
+++ b/plugins/router_redirect/router_redirect.c
@@ -20,7 +20,10 @@ int uwsgi_routing_func_redirect(struct wsgi_request *wsgi_req, struct uwsgi_rout
         iov[1].iov_base = " 302 Found\r\nLocation: ";
         iov[1].iov_len = 22;
 
-	iov[2].iov_base = uwsgi_regexp_apply_ovec(wsgi_req->path_info, wsgi_req->path_info_len, ur->data, ur->data_len, ur->ovector, ur->ovn);
+	char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+	iov[2].iov_base = uwsgi_regexp_apply_ovec(*subject, *subject_len, ur->data, ur->data_len, ur->ovector, ur->ovn);
 	iov[2].iov_len = strlen(iov[2].iov_base);
 
 	iov[3].iov_base = "\r\n\r\n";
diff --git a/plugins/router_rewrite/router_rewrite.c b/plugins/router_rewrite/router_rewrite.c
new file mode 100644
index 00000000..d45e6d75
--- /dev/null
+++ b/plugins/router_rewrite/router_rewrite.c
@@ -0,0 +1,111 @@
+#include "../../uwsgi.h"
+#ifdef UWSGI_ROUTING
+
+extern struct uwsgi_server uwsgi;
+
+int uwsgi_routing_func_rewrite(struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
+
+	char **subject = (char **) (((char *)(wsgi_req))+ur->subject);
+        uint16_t *subject_len = (uint16_t *)  (((char *)(wsgi_req))+ur->subject_len);
+
+        char *path_info = uwsgi_regexp_apply_ovec(*subject, *subject_len, ur->data, ur->data_len, ur->ovector, ur->ovn);
+	uint16_t path_info_len = strlen(path_info);
+
+	uint16_t query_string_len = 0;
+	
+	char *query_string = strchr(path_info, '?');
+	if (query_string) {
+		path_info_len = query_string - path_info;
+		query_string++;
+		query_string_len = strlen(query_string);
+	
+	}
+	else {
+		query_string = "";
+	}
+
+	char *ptr = uwsgi_req_append(wsgi_req, "PATH_INFO", 9, path_info, path_info_len);
+        if (!ptr) goto clear;
+
+        // fill iovec
+        if (wsgi_req->var_cnt + 2 >= uwsgi.vec_size - (4 + 1)) {
+		uwsgi_log("not enough io vectors for rewriting url\n");
+		goto clear;
+	}
+
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_base = ptr - (2 + 9);
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_len = 9;
+        wsgi_req->var_cnt++;
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_base = ptr;
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_len = path_info_len;
+        wsgi_req->var_cnt++;
+
+	// set new path_info
+	wsgi_req->path_info = ptr;
+	wsgi_req->path_info_len = path_info_len;
+
+	ptr = uwsgi_req_append(wsgi_req, "QUERY_STRING", 12, query_string, query_string_len);
+	if (!ptr) goto clear;
+
+        // fill iovec
+        if (wsgi_req->var_cnt + 2 >= uwsgi.vec_size - (4 + 1)) {
+		uwsgi_log("not enough io vectors for rewriting url\n");
+		goto clear;
+	}
+
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_base = ptr - (2 + 12);
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_len = 12;
+        wsgi_req->var_cnt++;
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_base = ptr;
+        wsgi_req->hvec[wsgi_req->var_cnt].iov_len = query_string_len;
+        wsgi_req->var_cnt++;
+
+
+	// set new query_string
+	wsgi_req->query_string = ptr;
+	wsgi_req->query_string_len = query_string_len;
+
+	free(path_info);
+	if (ur->custom)
+		return UWSGI_ROUTE_CONTINUE;
+	return UWSGI_ROUTE_NEXT;
+
+clear:
+	free(path_info);
+	return UWSGI_ROUTE_BREAK;
+}
+
+int uwsgi_router_rewrite(struct uwsgi_route *ur, char *args) {
+
+        ur->func = uwsgi_routing_func_rewrite;
+        ur->data = args;
+        ur->data_len = strlen(args);
+        return 0;
+}
+
+
+int uwsgi_router_rewrite_last(struct uwsgi_route *ur, char *args) {
+
+        ur->func = uwsgi_routing_func_rewrite;
+        ur->data = args;
+        ur->data_len = strlen(args);
+	ur->custom = 1;
+        return 0;
+}
+
+
+void router_rewrite_register(void) {
+
+	uwsgi_register_router("rewrite", uwsgi_router_rewrite);
+	uwsgi_register_router("rewrite-last", uwsgi_router_rewrite_last);
+}
+
+struct uwsgi_plugin router_rewrite_plugin = {
+	.name = "router_rewrite",
+	.on_load = router_rewrite_register,
+};
+#else
+struct uwsgi_plugin router_rewrite_plugin = {
+	.name = "router_rewrite",
+};
+#endif
diff --git a/plugins/router_rewrite/uwsgiplugin.py b/plugins/router_rewrite/uwsgiplugin.py
new file mode 100644
index 00000000..34fc8148
--- /dev/null
+++ b/plugins/router_rewrite/uwsgiplugin.py
@@ -0,0 +1,6 @@
+NAME='router_rewrite'
+
+CFLAGS = []
+LDFLAGS = []
+LIBS = []
+GCC_LIST = ['router_rewrite']