diff --git a/TODO b/TODO
index f4d89f2ceca..c9880205757 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
-* Create /etc/issue in xbps-base-files.
 * Add a trigger for fc-cache.
 * Add a trigger to (un)register users/groups. Currently packages that
   require user/groups use custom INSTALL/REMOVE scripts, which adds
diff --git a/templates/xbps-base-files/files/issue b/templates/xbps-base-files/files/issue
new file mode 100644
index 00000000000..f551084d5fc
--- /dev/null
+++ b/templates/xbps-base-files/files/issue
@@ -0,0 +1,2 @@
+Welcome to XBPS \s \r \m (\l on \n)
+
diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template
index 0bd0f04bc28..2f239dcd781 100644
--- a/templates/xbps-base-files/template
+++ b/templates/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.24
+version=0.25
 build_style=custom-install
 short_desc="xbps base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,8 @@ base_chroot=yes
 noarch=yes
 
 conf_files="/etc/profile /etc/hosts /etc/host.conf /etc/securetty
- /etc/skel/.bash_profile /etc/skel/.bash_logout /etc/skel/.bashrc"
+ /etc/skel/.bash_profile /etc/skel/.bash_logout /etc/skel/.bashrc
+ /etc/issue"
 
 do_install()
 {
@@ -76,6 +77,7 @@ do_install()
 	install -m600 ${FILESDIR}/securetty ${DESTDIR}/etc
 	install -m644 ${FILESDIR}/hosts ${DESTDIR}/etc
 	install -m644 ${FILESDIR}/host.conf ${DESTDIR}/etc
+	install -m644 ${FILESDIR}/issue ${DESTDIR}/etc
 
 	install -d ${DESTDIR}/etc/profile.d
 	install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d