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..05c8477
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+0xFFFF-0.3.9.tar.gz
diff --git a/0xFFFF.spec b/0xFFFF.spec
new file mode 100644
index 0000000..7e4260c
--- /dev/null
+++ b/0xFFFF.spec
@@ -0,0 +1,51 @@
+Name:           0xFFFF
+Version:        0.3.9
+Release:        2%{?dist}
+Summary:        The Open Free Fiasco Firmware Flasher
+
+Group:          Applications/System
+License:        GPLv3
+URL:            http://www.nopcode.org/0xFFFF/
+Source0:        http://www.nopcode.org/0xFFFF/get/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libusb-devel
+
+%description
+The 'Open Free Fiasco Firmware Flasher' aka 0xFFFF utility implements
+a free (GPL3) userspace handler for the NOLO bootloader and related
+utilities for the Nokia Internet Tablets like flashing setting device
+options, packing/unpacking FIASCO firmware format and more.
+
+%prep
+%setup -q
+sed -i /^LDFLAGS/d config.mk
+sed -i "s/^CFLAGS+=.*/CFLAGS+=$RPM_OPT_FLAGS/" config.mk
+
+%build
+make -C src %{?_smp_mflags}
+make -C logotool CFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 src/0xFFFF $RPM_BUILD_ROOT%{_bindir}/0xFFFF
+install -m0755 logotool/logotool $RPM_BUILD_ROOT%{_bindir}/logotool
+
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README INSTALL
+%{_bindir}/*
+
+%changelog
+* Sat Sep 13 2008 David Woodhouse <David.Woodhouse@intel.com> 0.3.9-2
+- Use $RPM_OPT_FLAGS for logotool, don't attempt to build GUI
+
+* Sat Sep 13 2008 David Woodhouse <David.Woodhouse@intel.com> 0.3.9-1
+- First package
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f929b84..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 0xFFFF
-# $Id$
-NAME := 0xFFFF
-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..b267913 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+9966d488fd41fa1ca654f08086b06fee  0xFFFF-0.3.9.tar.gz