diff --git a/.gitignore b/.gitignore
index 148c4fc..384cec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ setup-2.8.25.tar.bz2
 /setup-2.12.1.tar.bz2
 /setup-2.12.2.tar.bz2
 /setup-2.12.3.tar.bz2
+/setup-2.12.5.tar.bz2
diff --git a/setup.spec b/setup.spec
index 500cd88..dca0104 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.12.3
+Version: 2.12.5
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -30,6 +30,7 @@ make check
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/etc/profile.d
+mkdir -p %{buildroot}/etc/motd.d
 cp -ar * %{buildroot}/etc
 mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/
 rm -f %{buildroot}/etc/uidgid
@@ -82,6 +83,7 @@ end
 %config(noreplace) /etc/hosts.allow
 %config(noreplace) /etc/hosts.deny
 %verify(not md5 size mtime) %config(noreplace) /etc/motd
+%dir /etc/motd.d
 %config(noreplace) /etc/printcap
 %verify(not md5 size mtime) %config(noreplace) /etc/inputrc
 %config(noreplace) /etc/bashrc
@@ -100,6 +102,12 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Wed Dec 12 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.5-1
+- use full path for non-builtins in profile and lang.sh (#1648589)
+
+* Mon Dec 10 2018 Robert Fairley <rfairley@redhat.com> - 2.12.4-1
+- own /etc/motd.d 
+
 * Fri Oct 26 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.3-1
 - inputrc - replace quoted-insert with overwrite-mode 
   for the "Insert" key
diff --git a/sources b/sources
index 05f4a16..6002cf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setup-2.12.3.tar.bz2) = a2f31e85e5120b22c478676532d2eeb54f9f064a973b406af6efe5b4ffecfea67c3348fe62eb46b3884bfcf2ee712c9516368460544b114c0ba49c5ee0ae4449
+SHA512 (setup-2.12.5.tar.bz2) = 98e47af14c51a50127436ea53be5d931917ff9ac0001025c2159104bd49bdb936eb680912d96abd76d6be6bb6c8cdb3019a824b48f33ba93185b04b1b1fc5aa2