diff --git a/wayland.spec b/wayland.spec
index 8a5b116..10313ee 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -23,10 +23,10 @@ Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        HPND
 Group:          Development/Libraries/C and C++
-Url:            http://wayland.freedesktop.org/
+URL:            http://wayland.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/wayland/wayland
 #Git-Web:	http://cgit.freedesktop.org/wayland/wayland/
-Source:         http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
+Source:         http://wayland.freedesktop.org/releases/%name-%version.tar.xz
 Patch0:         wayland-1.3.93-resourcestest.patch
 #git#BuildRequires:  autoconf >= 2.64
 #git#BuildRequires:  automake >= 1.11
@@ -39,7 +39,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(libffi)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 
 %description
 Wayland is a protocol for a compositor to talk to its clients as well
@@ -86,9 +86,9 @@ fullscreen) or other display servers.
 %package devel
 Summary:        Development files for the Wayland Compositor Infrastructure
 Group:          Development/Libraries/C and C++
-Requires:       libwayland-client0 = %{version}
-Requires:       libwayland-cursor0 = %{version}
-Requires:       libwayland-server0 = %{version}
+Requires:       libwayland-client0 = %version
+Requires:       libwayland-cursor0 = %version
+Requires:       libwayland-server0 = %version
 
 %description devel
 Wayland is a protocol for a compositor to talk to its clients as well
@@ -109,13 +109,13 @@ to develop applications that require these.
 if [ ! -e configure ]; then
 	autoreconf -fi;
 fi;
-%configure --disable-static --includedir="%{_includedir}/pkg/%{name}"
+%configure --disable-static --includedir="%_includedir/pkg/%name"
 make %{?_smp_mflags} V=1
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-find %{buildroot} -type f -name "*.la" -delete -print
-%fdupes %{buildroot}/%{_prefix}
+make DESTDIR=%buildroot install %{?_smp_mflags}
+find %buildroot -type f -name "*.la" -delete -print
+%fdupes %buildroot/%_prefix
 
 %check
 %if !0%{?qemu_user_space_build}
@@ -139,25 +139,25 @@ make check %{?_smp_mflags} V=1
 
 %files -n libwayland-client0
 %defattr(-,root,root)
-%{_libdir}/libwayland-client.so.0*
+%_libdir/libwayland-client.so.0*
 
 %files -n libwayland-cursor0
 %defattr(-,root,root)
-%{_libdir}/libwayland-cursor.so.0*
+%_libdir/libwayland-cursor.so.0*
 
 %files -n libwayland-server0
 %defattr(-,root,root)
-%{_libdir}/libwayland-server.so.0*
+%_libdir/libwayland-server.so.0*
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/wayland-scanner
-%{_includedir}/pkg/
-%{_libdir}/libwayland-*.so
-%{_libdir}/pkgconfig/wayland-*.pc
-%{_datadir}/aclocal/
-%{_datadir}/pkgconfig/wayland-*.pc
-%{_datadir}/wayland/
-%{_mandir}/man3/wl_*.3*
+%_bindir/wayland-scanner
+%_includedir/pkg/
+%_libdir/libwayland-*.so
+%_libdir/pkgconfig/wayland-*.pc
+%_datadir/aclocal/
+%_datadir/pkgconfig/wayland-*.pc
+%_datadir/wayland/
+%_mandir/man3/wl_*.3*
 
 %changelog