diff --git a/hdparm.changes b/hdparm.changes
index 54043d0..99d9676 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  8 21:21:42 UTC 2014 - jengelh@inai.de
+
+- Use preferred download URL; replace only rpm shell vars with
+  macros to go in line with the rest.
+
 -------------------------------------------------------------------
 Mon Nov 17 02:21:00 UTC 2014 - Led <ledest@gmail.com>
 
diff --git a/hdparm.spec b/hdparm.spec
index 04c7e9f..2131030 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -24,7 +24,8 @@ Release:        0
 Summary:        A Program to get and set hard disk parameters
 License:        SUSE-Permissive
 Group:          Hardware/Other
-Source:         http://sourceforge.net/projects/hdparm/files/hdparm/%{name}-%{version}.tar.gz
+
+Source:         http://downloads.sf.net/hdparm/%name-%version.tar.gz
 Source1:        56-idedma.rules
 Source2:        sysconfig.ide
 Source3:        udev.idedma.sh
@@ -52,27 +53,27 @@ driver and IDE drives.
 %patch4 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -Wall -Wstrict-prototypes" LDFLAGS= CC="%{__cc}"
+make CFLAGS="%optflags -Wall -Wstrict-prototypes" LDFLAGS= CC="%{__cc}"
 cp -p wiper/README.txt README.wiper
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
-install -d $RPM_BUILD_ROOT/%{_sbindir}
-%make_install binprefix=%{_prefix}
+mkdir -p "%buildroot/usr/share/man/man8"
+install -d "%buildroot/%_sbindir"
+%make_install binprefix="%_prefix"
 mv contrib/README contrib/README.contrib
-install -d $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 %{S:1} $RPM_BUILD_ROOT%{_udevrulesdir}
-install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 %{S:3} $RPM_BUILD_ROOT/%{_udevdir}/idedma.sh
-install -d $RPM_BUILD_ROOT/usr/lib/hdparm
-install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm
-install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm
-install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/%{_sbindir}
+install -d "%buildroot/%_udevrulesdir"
+install -m 644 %{S:1} "%buildroot/%_udevrulesdir"
+install -d "%buildroot/var/adm/fillup-templates"
+install -m 644 %{S:2} "%buildroot/var/adm/fillup-templates"
+install -m 755 %{S:3} "%buildroot/%_udevdir/idedma.sh"
+install -d "%buildroot/usr/lib/hdparm"
+install -m 755 contrib/idectl "%buildroot/usr/lib/hdparm"
+install -m 755 contrib/ultrabayd "%buildroot/usr/lib/hdparm"
+install -m 755 wiper/wiper.sh "%buildroot/%_sbindir"
 #UsrMerge
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -sf %{_sbindir}/wiper.sh $RPM_BUILD_ROOT/sbin
-ln -sf %{_sbindir}/hdparm $RPM_BUILD_ROOT/sbin
+mkdir -p "%buildroot/sbin"
+ln -sf %{_sbindir}/wiper.sh "%buildroot/sbin"
+ln -sf %{_sbindir}/hdparm "%buildroot/sbin"
 #EndUsrMerge
 
 %post