diff --git a/srcpkgs/rc/patches/quoting-fix.patch b/srcpkgs/rc/patches/quoting-fix.patch
new file mode 100644
index 0000000000..48490f2d59
--- /dev/null
+++ b/srcpkgs/rc/patches/quoting-fix.patch
@@ -0,0 +1,24 @@
+--- tree.c	2001-10-01 09:21:08.000000000 -0300
++++ tree.c.new	2007-09-30 00:36:37.968464448 -0300
+@@ -81,8 +81,9 @@
+ 		n->u[2].i = s->u[2].i;
+ 		break;
+ 	case nWord:
+-		n = (*alloc)(offsetof(Node, u[2]));
++		n = (*alloc)(offsetof(Node, u[3]));
+ 		n->u[0].s = strcpy((char *) (*alloc)(strlen(s->u[0].s) + 1), s->u[0].s);
++		n->u[2].i = s->u[2].i;
+ 		if (s->u[1].s != NULL) {
+ 			size_t i = strlen(s->u[0].s);
+ 			n->u[1].s = (*alloc)(i);
+--- footobar.c	2001-10-12 06:10:27.000000000 -0300
++++ footobar.c.new	2007-09-30 00:39:06.458259082 -0300
+@@ -73,7 +73,7 @@
+ 	case nForin:	fmtprint(f, "for(%T in %T)%T", n->u[0].p, n->u[1].p, n->u[2].p); break;
+ 	case nVarsub:	fmtprint(f, "$%T(%T)", n->u[0].p, n->u[1].p);		break;
+ 	case nWord:
+-		fmtprint(f, quotep(n->u[0].s, dollar) ? "%#S" : "%S", n->u[0].s);
++	fmtprint(f, n->u[2].i || quotep(n->u[0].s, dollar) ? "%#S" : "%S", n->u[0].s);
+ 		break;
+ 	case nLappend: {
+ 		static bool inlist;
diff --git a/srcpkgs/rc/template b/srcpkgs/rc/template
new file mode 100644
index 0000000000..5d7ac6fa82
--- /dev/null
+++ b/srcpkgs/rc/template
@@ -0,0 +1,14 @@
+# Template file for 'rc'
+pkgname=rc
+version=1.7.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-readline"
+makedepends="readline-devel"
+depends=""
+short_desc="An alternative implementation of the plan 9 rc shell"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="custom"
+homepage="http://tobold.org/article/rc"
+distfiles="http://static.tobold.org/$pkgname/$pkgname-$version.tar.gz"
+checksum=1cff23e897a038422458ba01567a5a2650935205862c3bbf73e773807c248240