diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index df25e0d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dropwatch-1.0.tbz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2b07926
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+dropwatch-1.0.tbz2
+dropwatch-1.1-0.tbz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4dec0cd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: dropwatch
-# $Id$
-NAME := dropwatch
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/dropwatch.spec b/dropwatch.spec
index d6a0452..16ec92c 100644
--- a/dropwatch.spec
+++ b/dropwatch.spec
@@ -1,13 +1,15 @@
+%define upstream_release 0
 Summary: Kernel dropped packet monitor 
 Name: dropwatch 
-Version: 1.0 
-Release: 3%{?dist} 
-Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2
+Version: 1.1
+Release: 2%{?dist} 
+Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}-%{upstream_release}.tbz2
 URL: http://fedorahosted.org/dropwatch
 License: GPLv2+ 
 Group: Applications/System 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: kernel-devel, libnl-devel, readline-devel
+BuildRequires: binutils-devel, binutils-static
 Requires: libnl, readline
 
 %description
@@ -15,7 +17,7 @@ dropwatch is an utility to interface to the kernel to monitor for dropped
 network packets.
 
 %prep
-%setup -q
+%setup -q -n dropwatch-%{version}
 
 %build
 cd src
@@ -41,6 +43,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Thu Apr 07 2010 Neil Horman <nhorman@redhat.com> - 1.1-2
+- Adding more missing buildrequires
+
+* Wed Apr 07 2010 Neil Horman <nhorman@redhat.com> - 1.1-1
+- Add missing buildrequires
+
+* Wed Apr 07 2010 Neil Horman <nhorman@redhat.com> - 1.1-0
+- Move to latest upstream sources
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/import.log b/import.log
deleted file mode 100644
index 7041828..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-dropwatch-1_0-2_fc10:HEAD:dropwatch-1.0-2.fc10.src.rpm:1237918003
diff --git a/sources b/sources
index ea50cab..7092b0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34338735d1d2d339c92f21d9c7f1202f  dropwatch-1.0.tbz2
+f17a6ec30f82a2c1c5a675325d3e722a  dropwatch-1.1-0.tbz2