diff --git a/.gitignore b/.gitignore
index cf51ef5..ce1f6ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 clog
-gnu-efi-3.0e.tar.bz2
-/gnu-efi-3.0q.tar.gz
+gnu-efi?3.0*.tar.*
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 8dbabda..90df768 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -1,11 +1,11 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
-Version: 3.0q
-Release: 2%{?dist}
+Version: 3.0s
+Release: 1%{?dist}
 Group: Development/System
 License: BSD 
 URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
-Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
+Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi_%{version}.orig.tar.gz
 Patch0: gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
 Patch1: gnu-efi-3.0q-route80h.patch
 Patch2: gnu-efi-3.0q-modelist.patch
@@ -24,7 +24,7 @@ This package contains development headers and libraries for developing
 applications that run under EFI (Extensible Firmware Interface).
 
 %prep
-%setup -q
+%setup -q -n gnu-efi-3.0
 git init
 git config user.email "pjones@fedoraproject.org"
 git config user.name "Fedora Ninjas"
diff --git a/sources b/sources
index c75f7af..d133db0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c3a873b364aa58c057f829c83463925  gnu-efi-3.0q.tar.gz
+11f63d52071f7382f56c9e81d0aece91  gnu-efi_3.0s.orig.tar.gz