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 f9a56a0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: corkscrew
-# $Id$
-NAME := corkscrew
-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/corkscrew.spec b/corkscrew.spec
index 9ffd62b..14858be 100644
--- a/corkscrew.spec
+++ b/corkscrew.spec
@@ -1,17 +1,17 @@
-Summary: Tool for tunneling SSH through HTTP proxies
-Name: corkscrew
-Version: 2.0
-Release: 6%{dist}
-License: GPLv2
-Group: Applications/Internet
-URL: http://www.agroman.net/corkscrew/
-Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz
-Source1: %{name}.1
+Summary:	Tool for tunneling SSH through HTTP proxies
+Name:		corkscrew
+Version:	2.0
+Release:	8%{?dist}
+License:	GPLv2
+Group:		Applications/Internet
+URL:		http://www.agroman.net/corkscrew/
+Source0:	http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz
+Source1:	%{name}.1
 
-Patch0: %{name}-%{version}-from-debian.patch
-Patch1: %{name}-%{version}-typo.patch
+Patch0:		%{name}-%{version}-from-debian.patch
+Patch1:		%{name}-%{version}-typo.patch
 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Corkscrew is a tool for tunneling SSH through HTTP proxies.
@@ -35,21 +35,32 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 
 # man page
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc README
+%doc TODO
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Feb 09 2008 Debarshi Ray <rishi@fedoraproject.org> - 2.0-8
+- Rebuilding with gcc-4.3 in Rawhide.
+
+* Fri Nov 16 2007 Debarshi Ray <rishi@fedoraproject.org> - 2.0-7
+- Fixed the value of Release according to Fedora dist tag guidelines.
+- Preserved timestamps using 'install -p'.
+
 * Fri Aug 03 2007 Debarshi Ray <rishi@fedoraproject.org> - 2.0-6
 - Moved the online manual page from Patch0 to Source1.