diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index d8f4c38..fca8f90 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -43,7 +43,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL-2.0 and CPL
 URL:            https://www.eclipse.org/cdt
 
@@ -447,29 +447,29 @@ sed -i -e '/-data/i-configuration' -e '/-data/i@user.home\/fcdtdebugger' \
 
 # Install icons for standalone debugger
 install -D debug/org.eclipse.cdt.debug.application/icons/cc32.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{name}.png
+    %{buildroot}/usr/share/icons/hicolor/32x32/apps/%{name}.png
 install -D debug/org.eclipse.cdt.debug.application/icons/cc48.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
+    %{buildroot}/usr/share/icons/hicolor/48x48/apps/%{name}.png
 install -D debug/org.eclipse.cdt.debug.application/icons/cc128.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/%{name}.png
+    %{buildroot}/usr/share/icons/hicolor/128x128/apps/%{name}.png
 install -D debug/org.eclipse.cdt.debug.application/icons/cc.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{name}.png
-install -d $RPM_BUILD_ROOT/usr/share/pixmaps
+    %{buildroot}/usr/share/icons/hicolor/256x256/apps/%{name}.png
+install -d %{buildroot}/usr/share/pixmaps
 ln -s /usr/share/icons/hicolor/256x256/apps/%{name}.png \
-    $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png
+    %{buildroot}/usr/share/pixmaps/%{name}.png
 
 # Fix permissions on native libraries
-find $RPM_BUILD_ROOT -name *.so -exec chmod +x {} \;
+find %{buildroot} -name *.so -exec chmod +x {} \;
 
 # Install desktop file
 sed -i -e 's|Exec=cdtdebug|Exec=%{app_exec}|g' desktop/eclipse-cdt.desktop
 sed -i -e 's|Name=Eclipse.*|Name=%{app_name}|g' desktop/eclipse-cdt.desktop
 sed -i -e "s|Icon=eclipse|Icon=%{name}|g" desktop/eclipse-cdt.desktop
-install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
-desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+install -D desktop/eclipse-cdt.desktop %{buildroot}/usr/share/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/usr/share/applications/%{name}.desktop
 
 # Install man page
-install -D -m 644 man/cdtdebug.man $RPM_BUILD_ROOT/%{_mandir}/man1/cdtdebug.1
+install -D -m 644 man/cdtdebug.man %{buildroot}/%{_mandir}/man1/cdtdebug.1
 
 %files -f .mfiles
 %if %{_enable_remote_support}
@@ -507,6 +507,9 @@ install -D -m 644 man/cdtdebug.man $RPM_BUILD_ROOT/%{_mandir}/man1/cdtdebug.1
 %endif
 
 %changelog
+* Wed Jul 22 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-3
+- Fix inconsistent buildroot macro usage
+
 * Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-2
 - Enable bootstrap mode and misc other improvements