diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c0f296d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: util-linux-ng
-# $Id$
-NAME := util-linux-ng
-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 $$/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/util-linux-ng.spec b/util-linux-ng.spec
index 3918669..cac0639 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.13.1
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -33,7 +33,7 @@ BuildRequires: pam-devel
 BuildRequires: slang-devel
 BuildRequires: texinfo
 BuildRequires: zlib-devel
-BuildRequires: popt-devel
+BuildRequires: popt
 
 ### Sources
 #Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.tar.bz2
@@ -525,6 +525,9 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Tue Dec 11 2007 Dennis Gilmore <dennis@laptop.org> 2.13.1-0.2
+- BR popt  since popt-devel does not exist on F-7  which olpc is based on
+
 * Sun Dec  9 2007 Karel Zak <kzak@redhat.com> 2.13.1-0.1
 - update to the latest upstream stable branch
   (commit: fda9d11739ee88c3b2f22a73f12ec019bd3b8335)