diff --git a/ipmitool.spec b/ipmitool.spec
index 3a79e0f..46aa143 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -7,7 +7,7 @@ Version:      1.8.18
 Release:      14%{?dist}
 License:      BSD
 URL:          http://ipmitool.sourceforge.net/
-Source0:      https://github.com/%{name}/%{name}/archive/%{gitname}_%{gitversion}.tar.gz
+Source0:      https://github.com/%{name}/%{name}/archive/%{gitname}_%{gitversion}/%{name}-%{version}.tar.gz
 Source1:      openipmi-ipmievd.sysconf
 Source2:      ipmievd.service
 Source3:      exchange-bmc-os-info.service
@@ -85,7 +85,7 @@ for the host OS to use.
 
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-%{gitname}_%{gitversion} -p1
 
 for f in AUTHORS ChangeLog; do
     iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8