diff --git a/zoneminder.spec b/zoneminder.spec
index 7901692..428b614 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -127,28 +127,28 @@ make install DESTDIR=%{buildroot} \
 rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
 rm -f %{buildroot}/%{_bindir}/zmx10.pl
 
-install -m 755 -d %{buildroot}/%{_localstatedir}/log/zoneminder
+install -m 755 -d %{buildroot}/var/log/zoneminder
 for dir in events images temp
 do
-    install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/$dir
-    rmdir %{buildroot}/%{_datadir}/%{name}/www/$dir
-    ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir %{buildroot}/%{_datadir}/%{name}/www/$dir
+    install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir
+    rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+    ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir
 done
-install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/sock
-install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/swap
-install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload
+install -m 755 -d %{buildroot}/var/lib/zoneminder/sock
+install -m 755 -d %{buildroot}/var/lib/zoneminder/swap
+install -m 755 -d %{buildroot}/var/spool/zoneminder-upload
 
-install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
-install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
+install -D -m 644 %{SOURCE2} %{buildroot}/etc/httpd/conf.d/zoneminder.conf
+install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav
 install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
 install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
 
 # Install jscalendar - this really should be in its own package
 install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
-cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar
 
 # Set up cambozola
-pushd %{buildroot}/%{_datadir}/%{name}/www
+pushd %{buildroot}/%{_datadir}/zoneminder/www
 ln -s ../../java/cambozola.jar
 popd
 
@@ -193,8 +193,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
-%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
+%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
 
@@ -219,24 +219,27 @@ fi
 
 %{perl_vendorlib}/ZoneMinder*
 %{_mandir}/man*/*
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/cgi-bin
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/db
-%{_datadir}/%{name}/www
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
 
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/sock
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/swap
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
 
 
 %changelog
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
 * Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
 - Convert to systemd.
 - Add tmpfiles.d configuration since the initscript isn't around to create