diff --git a/plymouth.spec b/plymouth.spec
index f2f1b06..8fcf365 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -59,6 +59,7 @@ Provides:       bootsplash = %{version}
 Obsoletes:      bootsplash < %{version}
 Requires:       gnu-unifont-bitmap-fonts
 Requires(post): plymouth-scripts
+Requires(post): mkinitrd
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -139,8 +140,8 @@ Requires:       coreutils
 Requires:       cpio
 Requires:       findutils
 Requires:       gzip
-Requires:       mkinitrd
 Requires:       plymouth
+Requires(post): mkinitrd
 BuildArch:      noarch
 
 %description scripts
@@ -379,15 +380,17 @@ popd
 rm -rf %{buildroot}
 
 %post
-[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
-%{_libexecdir}/plymouth/plymouth-update-initrd
-if [ $1 -eq 1 ]; then
-   if [ -f %{_sysconfdir}/default/grub ]; then
-        sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
-        grub2-mkconfig -o /boot/grub2/grub.cfg
-   fi
-   if [ -f /boot/grub/menu.lst ]; then
-        sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
+if [ ! -e /.buildenv ]; then 
+   [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
+   %{_libexecdir}/plymouth/plymouth-update-initrd
+   if [ $1 -eq 1 ]; then
+      if [ -f %{_sysconfdir}/default/grub ]; then
+          sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
+          grub2-mkconfig -o /boot/grub2/grub.cfg
+      fi
+      if [ -f /boot/grub/menu.lst ]; then
+          sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
+      fi
    fi
 fi
 
@@ -420,7 +423,7 @@ fi
 %postun -n libply2 -p /sbin/ldconfig
 
 %post theme-spinfinity
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R spinfinity
@@ -436,7 +439,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-fade-in
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R fade-in
@@ -452,7 +455,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-solar
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R solar
@@ -468,7 +471,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post branding-openSUSE
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R openSUSE