diff --git a/.gitignore b/.gitignore
index b0be937..89aa6df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-/biosdevname-0.3.1.tar.gz
-/biosdevname-0.3.2.tar.gz
-/biosdevname-0.3.3.tar.gz
-/biosdevname-0.3.4.tar.gz
-/biosdevname-0.3.5.tar.gz
-/biosdevname-0.3.6.tar.gz
-/biosdevname-0.3.7.tar.gz
-/biosdevname-0.3.8.tar.gz
-/biosdevname-0.3.11.tar.gz
+/biosdevname-*.tar.gz
diff --git a/biosdevname.spec b/biosdevname.spec
index 9cca299..6c50d85 100644
--- a/biosdevname.spec
+++ b/biosdevname.spec
@@ -1,6 +1,6 @@
 Name:		biosdevname
 Version:	0.3.11
-Release:	2%{?dist}
+Release:	6%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -11,14 +11,13 @@ URL:		http://linux.dell.com/files/%{name}
 # so, there haven't been any comments about that on LKML.
 ExclusiveArch:	%{ix86} x86_64 ia64
 Source0:	http://linux.dell.com/files/%{name}/permalink/%{name}-%{version}.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildRequires:	pciutils-devel, zlib-devel
 # to figure out how to name the rules file
 BuildRequires:	udev
 #To generate the configure script
-BuildRequires:  autoconf
+BuildRequires:	autoconf
 BuildRequires:  automake
-
 # for ownership of /etc/udev/rules.d
 Requires: udev
 
@@ -36,19 +35,14 @@ name (e.g. eth0).
 #If configure script doesn't exist generate it with autogen script
 [ -e ./configure ] || ./autogen.sh --no-configure
 
-
 # this is a udev rule, so it needs to live in / rather than /usr
 %configure --disable-rpath --prefix=/ --sbindir=/sbin
 make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make install install-data DESTDIR=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -59,9 +53,20 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.11-2
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
+* Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.11-5
+- Added automake as a build dependency
+
+* Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.11-4
+- Added autoconf as a build dependency
+
+* Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.11-3
+- Generating the configure script if it doesn't exist
+
+* Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.11-2
+- Fixed the dir structure inside the archive
 
 * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.11-1
 - Updating the sources to 0.3.11 version. Following are the changes:
@@ -79,6 +84,10 @@ rm -rf %{buildroot}
 - Don't display _vf suffix on NPAR devices with single function
 - Fix PCIe/PIRQ slot mapping
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> f16
 * Thu Apr 21 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.8-1
 - Add changes to parse VPD structure for device mapping on NPAR devices
 - Fix pathname