diff --git a/javacc.spec b/javacc.spec
index 8ffa287..ce9d9cf 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -98,10 +98,10 @@ rm -fr $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
-cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
+install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
+install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/%{_bindir}
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+cp -pr examples $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -148,6 +148,7 @@ fi
 %changelog
 * Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
 - Merged with upstream version
+- Changed directory locations to rpm macros
 - Added conditional native compiling
 
 * Thu Apr 20 2006 Fernando Nasser <fnasser@redhat.com> - 0:4.0-2jpp