diff --git a/TODO b/TODO
index 0f7119e59a8..cfc08cde377 100644
--- a/TODO
+++ b/TODO
@@ -6,4 +6,3 @@ Some stuff that should be done:
 * More robust and fast dependency checking.
 * wget now is required inside the chroot
   - etc/resolv.conf is copied before entering the chroot
-* ln -s /bin/bash /bin/sh
diff --git a/templates/bash.tmpl b/templates/bash.tmpl
index b752eec0997..fa6b9e2c82a 100644
--- a/templates/bash.tmpl
+++ b/templates/bash.tmpl
@@ -42,11 +42,3 @@ pre_configure()
 		cd $wrksrc && patch -s -p0 < $XBPS_SRCDISTDIR/bash32-$p || bye 1
 	done
 }
-
-post_install()
-{
-	# Make /bin/bash -> /bin/sh symlink.
-	if [ -x $XBPS_DESTDIR/$pkgname-$version/bin/bash ]; then
-		cd $XBPS_DESTDIR/$pkgname-$version/bin && ln -s bash sh
-	fi
-}
diff --git a/templates/dash.tmpl b/templates/dash.tmpl
new file mode 100644
index 00000000000..64e9d9af6de
--- /dev/null
+++ b/templates/dash.tmpl
@@ -0,0 +1,26 @@
+# Template file for 'dash'
+pkgname=dash
+version=0.5.4
+distfiles="
+http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin"
+short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
+long_desc="
+ Debian Almquist shell (dash) is a POSIX-compliant Unix shell, much smaller
+ than bash. It requires less disk space but is also less feature rich.
+
+ Dash is a direct descendant of the NetBSD version of the Almquist Shell
+ (ash). It was ported to Linux by Herbert Xu in early 1997. It was renamed to
+ dash in 2002."
+
+base_package=yes
+base_chroot=yes
+run_depends="glibc-2.8"
+
+post_install()
+{
+	cd $XBPS_DESTDIR/$pkgname-$version/bin && ln -s dash sh
+}
diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl
index 7dbc21adbd9..ceba1c1b080 100644
--- a/templates/xbps-base-chroot.tmpl
+++ b/templates/xbps-base-chroot.tmpl
@@ -12,4 +12,4 @@ base_chroot=yes
 build_depends="glibc-2.8 kernel-headers-2.6.27.3 bash-3.2 coreutils-6.12
  tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 findutils-4.4.0
  sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4
- wget-1.11.4"
+ wget-1.11.4 dash-0.5.4"