diff --git a/glusterfs.spec b/glusterfs.spec
index 1f2f6bd..fc41890 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -25,7 +25,7 @@ Group:          System/Filesystems
 Url:            http://www.gluster.org/
 #Git-Clone:	git://github.com/gluster/glusterfs
 #Git-Clone:	git://github.com/fvzwieten/lsgvt
-Source:         http://download.gluster.org/pub/gluster/glusterfs/3.8/%{version}/%{name}-%{version}.tar.gz
+Source:         http://download.gluster.org/pub/gluster/glusterfs/3.8/%version/%name-%version.tar.gz
 Patch1:         glusterfs-date.diff
 BuildRequires:  acl-devel
 BuildRequires:  autoconf
@@ -130,12 +130,12 @@ petabytes.
 %package devel
 Summary:        Development files for glusterfs
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
-Requires:       libgfapi0 = %{version}
-Requires:       libgfchangelog0 = %{version}
-Requires:       libgfrpc0 = %{version}
-Requires:       libgfxdr0 = %{version}
-Requires:       libglusterfs0 = %{version}
+Requires:       %name = %version
+Requires:       libgfapi0 = %version
+Requires:       libgfchangelog0 = %version
+Requires:       libgfrpc0 = %version
+Requires:       libgfxdr0 = %version
+Requires:       libglusterfs0 = %version
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -156,47 +156,47 @@ links.
 make %{?_smp_mflags}
 
 %install
-%make_install docdir="%{_docdir}/%{name}"
-find %{buildroot} -type f -name "*.la" -delete -print
+%make_install docdir="%_docdir/%name"
+find %buildroot -type f -name "*.la" -delete -print
 
-mkdir -p "%{buildroot}%{_localstatedir}/log"/{glusterd,glusterfs,glusterfsd};
+mkdir -p "%buildroot%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
 
 # The things seemingly forgotten by make install.
 # - Manually populate devel dirs
-mkdir -p "%{buildroot}%{_includedir}/%{name}";
-install -pm0644 libglusterfs/src/*.h "%{buildroot}%{_includedir}/%{name}/";
+mkdir -p "%buildroot%_includedir/%name";
+install -pm0644 libglusterfs/src/*.h "%buildroot%_includedir/%name/";
 # - hekafs wants this:
-mkdir -p "%{buildroot}%{_includedir}/%{name}"/{rpc,server};
+mkdir -p "%buildroot%_includedir/%name"/{rpc,server};
 install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \
-	"%{buildroot}%{_includedir}/%{name}/rpc/";
+	"%buildroot%_includedir/%name/rpc/";
 install -pm0644 xlators/protocol/server/src/*.h \
-	"%{buildroot}%{_includedir}/%{name}/server/";
+	"%buildroot%_includedir/%name/server/";
 # - init script; there is no SuSE-release in the build env
-mkdir -p "%{buildroot}%{_initddir}";
-install -pm0755 extras/init.d/glusterd-SuSE "%{buildroot}%{_initddir}/glusterd";
+mkdir -p "%buildroot%_initddir";
+install -pm0755 extras/init.d/glusterd-SuSE "%buildroot%_initddir/glusterd";
 # - wrapper umount script?
 # - logrotate entry
-mkdir -p "%{buildroot}%{_localstatedir}/log/%{name}";
+mkdir -p "%buildroot%_localstatedir/log/%name";
 # - vim syntax
 
 # - state
-mkdir -p "%{buildroot}%{_localstatedir}/lib/glusterd";
+mkdir -p "%buildroot%_localstatedir/lib/glusterd";
 perl -i -pe \
-	's{^(\s*option working-directory )\S+}{$1 %{_localstatedir}/lib/glusterd}g' \
-	"%{buildroot}%{_sysconfdir}/%{name}/glusterd.vol";
+	's{^(\s*option working-directory )\S+}{$1 %_localstatedir/lib/glusterd}g' \
+	"%buildroot%_sysconfdir/%name/glusterd.vol";
 
 # Clean, but must NOT remove .la from dirs not searched by
 # default, thus maxdepth.
-find %{buildroot} -type f -name "*.la" -delete -print
+find %buildroot -type f -name "*.la" -delete -print
 
 # W: wrong-file-end-of-line-encoding
-perl -i -pe 's{\x0d\x0a}{\x0a}gs' %{_docdir}/%{name}/glusterfs-mode.el;
+perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 
-mkdir -p "%{buildroot}%{_unitdir}";
-rm -Rf "%{buildroot}%{_initddir}"
-ln -s service "%{buildroot}%{_sbindir}/rcglusterd"
-chmod u-s "%{buildroot}%{_bindir}/fusermount-glusterfs"
-%fdupes %{buildroot}/%{_prefix}
+mkdir -p "%buildroot%_unitdir";
+rm -Rf "%buildroot%_initddir"
+ln -s service "%buildroot%_sbindir/rcglusterd"
+chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
+%fdupes %buildroot/%_prefix
 
 %pre
 %service_add_pre glusterd.service
@@ -225,68 +225,68 @@ chmod u-s "%{buildroot}%{_bindir}/fusermount-glusterfs"
 
 %files
 %doc COPYING-GPLV2 COPYING-LGPLV3 ChangeLog NEWS README.md
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/glusterd.vol
-%config(noreplace) %{_sysconfdir}/%{name}/glusterfs-logrotate
-%config %{_sysconfdir}/%{name}/gluster-rsyslog*.conf
-%config %{_sysconfdir}/%{name}/*.example
-%config %{_sysconfdir}/%{name}/*-logrotate
-%{_bindir}/fusermount-glusterfs
-%{_bindir}/glusterfind
-/sbin/mount.%{name}
-%{_libexecdir}/%{name}/
-%{_libdir}/%{name}/
-%{_sbindir}/gluster*
-%{_sbindir}/glfsheal
-%{_sbindir}/rcglusterd
-%{_sbindir}/gcron.py
-%{_sbindir}/gfind_missing_files
-%{_sbindir}/snap_scheduler.py
-%{_datadir}/glusterfs/
-%{_mandir}/man*/*
-%{_docdir}/%{name}
-%{_localstatedir}/lib/glusterd
-%{_localstatedir}/log/%{name}
-%{_unitdir}/glusterd.service
-%{_libexecdir}/ocf
+%dir %_sysconfdir/%name
+%config(noreplace) %_sysconfdir/%name/glusterd.vol
+%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
+%config %_sysconfdir/%name/gluster-rsyslog*.conf
+%config %_sysconfdir/%name/*.example
+%config %_sysconfdir/%name/*-logrotate
+%_bindir/fusermount-glusterfs
+%_bindir/glusterfind
+/sbin/mount.%name
+%_libexecdir/%name/
+%_libdir/%name/
+%_sbindir/gluster*
+%_sbindir/glfsheal
+%_sbindir/rcglusterd
+%_sbindir/gcron.py
+%_sbindir/gfind_missing_files
+%_sbindir/snap_scheduler.py
+%_datadir/glusterfs/
+%_mandir/man*/*
+%_docdir/%name
+%_localstatedir/lib/glusterd
+%_localstatedir/log/%name
+%_unitdir/glusterd.service
+%_libexecdir/ocf
 
 %files -n libgfapi0
-%{_libdir}/libgfapi.so.0*
+%_libdir/libgfapi.so.0*
 
 %files -n libgfchangelog0
-%{_libdir}/libgfchangelog.so.0*
+%_libdir/libgfchangelog.so.0*
 
 %files -n libgfrpc0
-%{_libdir}/libgfrpc.so.0*
+%_libdir/libgfrpc.so.0*
 
 %files -n libgfxdr0
-%{_libdir}/libgfxdr.so.0*
+%_libdir/libgfxdr.so.0*
 
 %files -n libglusterfs0
-%{_libdir}/libglusterfs.so.0*
+%_libdir/libglusterfs.so.0*
 
 %files -n libgfdb0
-%{_libdir}/libgfdb.so.0*
+%_libdir/libgfdb.so.0*
 
 %files ganesha
-%dir %{_sysconfdir}/ganesha
-%dir %{_libexecdir}/ganesha
-%{_sysconfdir}/ganesha/ganesha-ha.conf.sample
-%{_libexecdir}/ganesha/copy-export-ganesha.sh
-%{_libexecdir}/ganesha/create-export-ganesha.sh
-%{_libexecdir}/ganesha/dbus-send.sh
-%{_libexecdir}/ganesha/ganesha-ha.sh
-%{_libexecdir}/ganesha/generate-epoch.py
+%dir %_sysconfdir/ganesha
+%dir %_libexecdir/ganesha
+%_sysconfdir/ganesha/ganesha-ha.conf.sample
+%_libexecdir/ganesha/copy-export-ganesha.sh
+%_libexecdir/ganesha/create-export-ganesha.sh
+%_libexecdir/ganesha/dbus-send.sh
+%_libexecdir/ganesha/ganesha-ha.sh
+%_libexecdir/ganesha/generate-epoch.py
 
 %files -n python-gluster
-%dir %{python_sitelib}/gluster
-%dir %{python_sitelib}/gluster/glupy
-%{python_sitelib}/gluster/__init__.*
-%{python_sitelib}/gluster/glupy/__init__.*
+%dir %python_sitelib/gluster
+%dir %python_sitelib/gluster/glupy
+%python_sitelib/gluster/__init__.*
+%python_sitelib/gluster/glupy/__init__.*
 
 %files devel
-%{_includedir}/%{name}
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%_includedir/%name
+%_libdir/*.so
+%_libdir/pkgconfig/*.pc
 
 %changelog