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..a9ef0ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+PySolFC-1.1.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9b3ae30..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: PySolFC
-# $Id$
-NAME := PySolFC
-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/PySol.desktop b/PySol.desktop
new file mode 100644
index 0000000..bbf7902
--- /dev/null
+++ b/PySol.desktop
@@ -0,0 +1,96 @@
+[Desktop Entry]
+Encoding=UTF-8
+GenericName=Card Games
+GenericName[af]=Kaart Speletjie
+GenericName[ar]=لعبة ورق
+GenericName[az]=Kart Oyunu
+GenericName[be]=Картачная гульня
+GenericName[bg]=Игра с карти
+GenericName[bn]=তাসের খেলা
+GenericName[br]=C'hoari kartennoù
+GenericName[bs]=Igra s kartama
+GenericName[ca]=Joc de cartes
+GenericName[cs]=Karty
+GenericName[cy]=Gêm cardiau
+GenericName[da]=Kortspil
+GenericName[de]=Kartenspiel
+GenericName[el]=Παιχνίδι καρτών
+GenericName[eo]=Kartludo
+GenericName[es]=Juego de cartas
+GenericName[et]=Kaardimäng
+GenericName[eu]=Karta jokoa
+GenericName[fa]=کارت بازی
+GenericName[fi]=Korttipeli
+GenericName[fo]=Kortspøl
+GenericName[fr]=Jeu de cartes
+GenericName[fy]=Kaartspul
+GenericName[ga]=Cluiche Cártaí
+GenericName[gl]=Xogo de Cartas
+GenericName[he]=משחק קלפים
+GenericName[hi]=ताश के खेल
+GenericName[hr]=Kartaška igra
+GenericName[hsb]=Kartowa hra
+GenericName[hu]=Kártyajáték
+GenericName[is]=Kaplar
+GenericName[it]=Gioco di carte
+GenericName[ja]=カードゲーム
+GenericName[km]=ល្បែង​បៀរ
+GenericName[ko]=카드 놀이
+GenericName[lo]=ເກມໄພ້
+GenericName[lt]=Kortų žaidimas
+GenericName[lv]=Kāršu Spēle
+GenericName[mk]=Игра со карти
+GenericName[mn]=Хөзрийн тоглоом
+GenericName[ms]=Permainan Kad
+GenericName[mt]=Logħba tal-karti
+GenericName[nb]=Kortspill
+GenericName[nds]=Koortspeel
+GenericName[nl]=Kaartspel
+GenericName[nn]=Kortspel
+GenericName[nso]=Papadi ya Dikarata
+GenericName[pa]=ਤਾਸ਼ ਖੇਡ
+GenericName[pl]=Gra karciana
+GenericName[pt]=Jogo de Cartas
+GenericName[pt_BR]=Cartas
+GenericName[ro]=Joc de cărţi
+GenericName[ru]=Карточная игра
+GenericName[rw]=Umukino Ikarika
+GenericName[se]=Goartaspeallu
+GenericName[sk]=Kartová hra
+GenericName[sl]=Igra s kartami
+GenericName[sr]=Игра са картама
+GenericName[sr@Latn]=Igra sa kartama
+GenericName[ss]=Umdlalo welikhadi
+GenericName[sv]=Kortspel
+GenericName[ta]=கார்டு விளையாட்டு
+GenericName[tg]=Бозии Корт
+GenericName[th]=เกมไพ่
+GenericName[tr]=İskambil Oyunu
+GenericName[tt]=Kard Uyını
+GenericName[uk]=Карти
+GenericName[uz]=Қарта ўйини
+GenericName[ven]=Garata ya mutambo
+GenericName[vi]=Game thẻ
+GenericName[wa]=Cwårdjeu
+GenericName[xh]=Umdlalo Wekhadi
+GenericName[zh_CN]=牌类游戏
+GenericName[zh_TW]=紙牌遊戲
+GenericName[zu]=Umdlalo Wamakhadi
+Name=PySol
+Name[af]=Pysol
+Name[ar]=بايسول
+Name[bn]=পাই-সল
+Name[eo]=Soliterego
+Name[fa]=پایسول
+Name[hi]=पायसॉल
+Name[ko]=파이솔
+Name[lo]=Pysol
+Name[sv]=Pysol
+Name[th]=เกมถอดไพ่ PySol
+Name[vi]=PySol
+Exec=pysol
+Icon=pysol
+Terminal=false
+Type=Application
+Categories=Game;CardGame;
+Version=1.0
diff --git a/PySolFC.spec b/PySolFC.spec
new file mode 100644
index 0000000..4861c78
--- /dev/null
+++ b/PySolFC.spec
@@ -0,0 +1,86 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define debug_package %{nil}
+
+%define cardsetversion 1.1
+
+Name:           PySolFC
+Version:        1.1
+Release:        4%{?dist}
+Summary:        A collection of solitare card games
+Group:          Amusements/Games
+License:        GPLv2+
+URL:            http://pysolfc.sourceforge.net
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:        PySol.desktop
+Source2:        pysol-start-script
+Patch0:         pysolfc-setup.py-noglade.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+# optional but nice to have
+Requires:       python-imaging, tile
+# really required
+Requires:       tcl
+Requires:       tk, tix, tkinter
+Requires:       python-imaging-tk
+BuildRequires:  python-devel
+BuildRequires:  desktop-file-utils
+Provides:       pysol = %{version}-%{release}
+
+%description
+%{name} is a collection of more than 1000 solitaire card games. It is a fork
+of PySol solitare. Its features include modern look and feel (uses Tile widget
+set), multiple cardsets and tableau backgrounds, sound, unlimited undo, player
+statistics, a hint system, demo games, a solitaire wizard, support for user
+written plug-ins, an integrated HTML help browser, and lots of documentation.
+
+%prep
+%setup -q
+%patch0 -p0
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# install desktop file
+desktop-file-install --vendor="fedora" \
+    --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
+    %{SOURCE1}
+
+# install the startup wrapper
+mv $RPM_BUILD_ROOT%{_bindir}/pysol.py $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/pysol
+
+%find_lang pysol
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f pysol.lang
+%defattr(-,root,root)
+%doc README PKG-INFO COPYING
+%dir %{_datadir}/%{name}
+%dir %{python_sitelib}/pysollib
+%{python_sitelib}/pysollib/*
+%{_bindir}/pysol
+%{_datadir}/%{name}/*
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/fedora-*.desktop
+
+
+%changelog
+* Thu Nov 1 2007 Stewart Adam <s.adam@diffingo.com> 1.1-4
+- Provides: pysol since PySolFC is almost a drop-in replacement for
+  the now unmaintained pysol
+
+* Mon Oct 22 2007 Stewart Adam <s.adam@diffingo.com> 1.1-3
+- s/python-imageing-tk/python-imaging-tk/
+
+* Fri Oct 19 2007 Stewart Adam <s.adam@diffingo.com> 1.1-2
+- Add Requires: python-imageing-tk
+
+* Sat Sep 29 2007 Stewart Adam <s.adam@diffingo.com> 1.1-1
+- Initial release
+
diff --git a/pysol-start-script b/pysol-start-script
new file mode 100644
index 0000000..a4e4b15
--- /dev/null
+++ b/pysol-start-script
@@ -0,0 +1,3 @@
+#!/bin/sh
+/usr/share/PySolFC/pysol.py $*
+exit $?
diff --git a/pysolfc-setup.py-noglade.patch b/pysolfc-setup.py-noglade.patch
new file mode 100644
index 0000000..d8af596
--- /dev/null
+++ b/pysolfc-setup.py-noglade.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2007-09-29 16:41:41.000000000 -0400
++++ setup.py	2007-09-29 16:41:49.000000000 -0400
+@@ -44,7 +44,7 @@
+     for l in ('ru', 'ru_RU'):
+         data_files.append(('share/locale/%s/LC_MESSAGES' % l,
+                            ['locale/%s/LC_MESSAGES/pysol.mo' % l]))
+-    data_files.append((data_dir, ['data/pysolfc.glade']))
++    #data_files.append((data_dir, ['data/pysolfc.glade']))
+ 
+ ##from pprint import pprint; pprint(data_files)
+ ##import sys; sys.exit()
diff --git a/sources b/sources
index e69de29..51ec412 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+56aca8101b3534aaf3564c40ed6824f1  PySolFC-1.1.tar.bz2