diff --git a/openmotif.spec b/openmotif.spec
index 31cf69f..191d09a 100644
--- a/openmotif.spec
+++ b/openmotif.spec
@@ -168,13 +168,13 @@ mkdir -p $RPM_BUILD_ROOT%_x11sysconfdir/
 %__ln_s ../../..%_x11bindir/xmbind $RPM_BUILD_ROOT%_x11sysconfdir/xinit.d/
 
 %make_install install DESTDIR=$RPM_BUILD_ROOT
-
-mv $RPM_BUILD_ROOT%_libdir/X11/system.mwmrc $RPM_BUILD_ROOT%_x11sysconfdir/mwm
-for f in $RPM_BUILD_ROOT%_libdir/app-defaults/*; do
+mv $RPM_BUILD_ROOT%_libexecdir/X11/system.mwmrc $RPM_BUILD_ROOT%_x11sysconfdir/mwm
+for f in $RPM_BUILD_ROOT%_libexecdir/app-defaults/*; do
 	[ -f "$f" ] || continue
 	%__mv "$f" $RPM_BUILD_ROOT%_x11sysconfdir/app-defaults/
 done
 
+rm -Rf %buildroot%_datadir/Xm/Exm
 %if_with demos
 /bin/ls -1 $RPM_BUILD_ROOT%_bindir/* |
 	%__sed -e "s,$RPM_BUILD_ROOT,,g" |
@@ -206,7 +206,7 @@ done
 
 %files clients
 %_x11sysconfdir/xinit.d/xmbind
-%_libdir/X11/bindings
+%_libexecdir/X11/bindings
 %_bindir/xmbind
 %_bindir/uil
 %_man1dir/uil.1*