diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..0583a5e
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+utf8-string-0.3.6.tar.gz
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f12b1a0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: ghc-utf8-string
+# $Id$
+NAME := ghc-utf8-string
+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 $$d/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/dead.package b/dead.package
deleted file mode 100644
index f1464f6..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-removed for f13: utf8-string is part of ghc since 6.10.3
\ No newline at end of file
diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec
new file mode 100644
index 0000000..6a3d4bd
--- /dev/null
+++ b/ghc-utf8-string.spec
@@ -0,0 +1,90 @@
+%global pkg_name utf8-string
+
+%global common_summary Haskell UTF8 layer for IO and Strings
+
+%global common_description The utf8-string package provides operations\
+for encoding UTF8 strings to Word8 lists and back, and for reading and writing\
+UTF8 without truncation. 
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
+%global debug_package %{nil}
+
+Name:           ghc-%{pkg_name}
+Version:        0.3.6
+Release:        3%{?dist}
+Summary:        %{common_summary}
+
+Group:          System Environment/Libraries
+License:        BSD
+URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
+Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+# fedora ghc archs:
+ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
+BuildRequires:  ghc-doc
+BuildRequires:  ghc-prof
+
+%description
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
+%endif
+
+
+%{?ghc_lib_package}
+
+
+%prep
+%setup -q -n %{pkg_name}-%{version}
+
+
+%build
+%cabal_configure --ghc -p
+%cabal build
+%cabal haddock
+
+
+%install
+%cabal_install
+%cabal_pkg_conf
+
+%ghc_gen_filelists
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Tue Apr 27 2010 Jens Petersen <petersen@redhat.com> - 0.3.6-3
+- ghc-6.12.2 doesn't provide utf8-string again
+- condition ghc_lib_package
+
+* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.3.6-2
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common summary and common_description
+- use ghc_lib_package
+
+* Wed Dec 23 2009 Jens Petersen <petersen@redhat.com> - 0.3.6-1
+- update to 0.3.6
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 12 2009 Zachary Oglesby <zoglesby@fedoraproject.org> - 0.3.5-2
+- Added patch from Jens Petersen for better descriptions
+
+* Fri Jun 12 2009 Zachary Oglesby <zoglesby@fedoraproject.org> - 0.3.5-1
+- Updated to version 0.3.5
+
+* Fri Jun  5 2009 Zachary Oglesby <zoglesby@fedoraproject.org> - 0.3.4-2
+- Updated to new cabal2spec
+
+* Fri May 29 2009 Zachary Oglesby <zoglesby@fedoraproject.org> - 0.3.4-1
+- initial packaging for Fedora created by cabal2spec
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..ffc9ed1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+be8c5ef52a0824babdc89d60c1e9b600  utf8-string-0.3.6.tar.gz