diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..af90dd0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+x2vnc-1.7.2.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0af8035..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: x2vnc
-# $Id$
-NAME := x2vnc
-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/sources b/sources
index e69de29..47cd7e6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f23f86bcfa12a80eaeb886ab9b3ee447  x2vnc-1.7.2.tar.gz
diff --git a/x2vnc.spec b/x2vnc.spec
new file mode 100644
index 0000000..934ad05
--- /dev/null
+++ b/x2vnc.spec
@@ -0,0 +1,67 @@
+Name:          x2vnc 
+Version:       1.7.2 
+Release:       6%{?dist}
+Summary:       Dual screen hack for VNC 
+
+Group:         User Interface/X 
+License:       GPL 
+URL:           http://fredrik.hubbe.net/x2vnc.html
+Source0:       http://fredrik.hubbe.net/x2vnc/%{name}-%{version}.tar.gz 
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:        x2vnc_makefile.in.patch
+BuildRequires: libXxf86dga-devel, libXrandr-devel, libXinerama-devel
+BuildRequires: libXScrnSaver-devel
+
+%description
+This program will let you use two screens on two different comptuers
+as if they were connected to the same computer even if 
+one computer runs Windows. 
+
+%prep
+%setup -q
+%patch -b .patch0
+#Fix a file-not-utf8 warning in rpmlint
+for file in README x2vnc.man ; do
+  iconv -f ISO-8859-5 -t UTF-8 $file > $file.tmp && \
+    mv $file.tmp $file || rm -f $file.tmp
+done
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install 
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc README ChangeLog COPYING
+%{_bindir}/*
+%{_mandir}/man1/*
+
+
+%changelog
+* Sun Mar 04 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-6
+- Fixed a bug in spec
+
+* Sun Mar 04 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-5
+- Cleaned up spec file 
+
+* Sat Mar 03 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-4
+- Removed ls and pwd from spec (was used for debugging).
+
+* Sat Feb 24 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-3
+- Fixing a few more items presented in Bug #228434.
+
+* Tue Feb 20 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-2
+- Fixing Items presented in Bug #228434.
+
+* Tue Feb 12 2007 Michael Stahnke <mastahnke@gmail.com> - 1.7.2-1
+- Initial packaging.
diff --git a/x2vnc_makefile.in.patch b/x2vnc_makefile.in.patch
new file mode 100644
index 0000000..6a55018
--- /dev/null
+++ b/x2vnc_makefile.in.patch
@@ -0,0 +1,18 @@
+--- Makefile.in	2007-02-12 14:53:13.000000000 -0600
++++ Makefile.in.new	2007-02-12 14:53:42.000000000 -0600
+@@ -19,12 +19,12 @@
+ install:: install.bin install.man
+ 
+ install.bin:
+-	test -d "$(DESTDIR)$(BINDIR)" || mkdir "$(DESTDIR)$(BINDIR)"
++	test -d "$(DESTDIR)$(BINDIR)" || mkdir -p "$(DESTDIR)$(BINDIR)"
+ 	@INSTALL_PROGRAM@ x2vnc "$(DESTDIR)$(BINDIR)/x2vnc"
+ 
+ install.man:
+-	test -d "$(DESTDIR)$(MANDIR)" || mkdir "$(DESTDIR)$(MANDIR)"
+-	test -d "$(DESTDIR)$(MANDIR)/man1" || mkdir "$(DESTDIR)$(MANDIR)/man1"
++	test -d "$(DESTDIR)$(MANDIR)" || mkdir -p "$(DESTDIR)$(MANDIR)"
++	test -d "$(DESTDIR)$(MANDIR)/man1" || mkdir -p "$(DESTDIR)$(MANDIR)/man1"
+ 	@INSTALL_DATA@ x2vnc.man "$(DESTDIR)$(MANDIR)/man1/x2vnc.1"
+ 
+ clean: