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 d302e61..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfhell
-# $Id$
-NAME := xfhell
-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..6325201 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ecaf2a9a48478f45d56bffac35773a82  xfhell-1.4.tar.gz
diff --git a/xfhell.desktop b/xfhell.desktop
new file mode 100644
index 0000000..d1169c3
--- /dev/null
+++ b/xfhell.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=xfhell
+GenericName=xfhell
+Comment=Ham Radio application for the Hellschreiber digital communications mode
+Exec=xfhell
+Icon=xfhell.png
+Terminal=false
+Type=Application
+Categories=HamRadio;
+Version=1.0
diff --git a/xfhell.png b/xfhell.png
new file mode 100644
index 0000000..68d6cf1
Binary files /dev/null and b/xfhell.png differ
diff --git a/xfhell.spec b/xfhell.spec
new file mode 100644
index 0000000..06bdcd4
--- /dev/null
+++ b/xfhell.spec
@@ -0,0 +1,72 @@
+Name:           xfhell
+Version:        1.4
+Release:        4%{?dist}
+Summary:        GTK based Ham Radio application for the Hellschreiber communications mode
+
+Group:          Applications/Communications
+License:        GPLv2+
+URL:            http://5b4az.chronos.org.uk/pages/digital.html
+Source0:        http://5b4az.chronos.org.uk/pkg/%{name}/%{name}-%{version}.tar.gz
+#add .desktop file
+Source1:        %{name}.desktop
+#temporary Icon
+Source2:        %{name}.png
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  autoconf, automake, gtk2-devel, desktop-file-utils
+#Requires:       
+
+%description
+xfhell is a GTK+ application for the "fuzzy" digital amateur radio 
+communication mode known as Hellschreiber. 
+
+
+%prep
+%setup -qn %{name}
+
+
+%build
+./autogen.sh
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# no upstream .desktop or icon yet
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
+cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install --vendor="fedora" \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+#Missing copy of the GPL, Notified upstream
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog README
+%doc doc/BDF_Spec.pdf doc/xfhell.html
+%{_bindir}/*
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/*%{name}.desktop
+
+%changelog
+* Sat Mar 01 2008 Robert 'Bob' Jensen <bob@bobjensen.com> - 1.4-4
+- Fix Source0 Screwup again
+
+* Sat Mar 01 2008 Robert 'Bob' Jensen <bob@bobjensen.com> - 1.4-3
+- Fix Source0 Screwup
+
+* Sat Mar 01 2008 Robert 'Bob' Jensen <bob@bobjensen.com> - 1.4-2
+- Add .desktop and icon
+- Submit for Review
+
+* Sat Mar 01 2008 Robert 'Bob' Jensen <bob@bobjensen.com> - 1.4-1
+- Upstream Version Bump
+
+* Mon Dec 10 2007 Sindre Pedersen Bjørdal - 1.3-1
+- Initial build