diff --git a/.cvsignore b/.cvsignore
index afcebb4..3687876 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-CCfits-2.0.tar.gz
-CCfits-2.1.tar.gz
+CCfits-2.2.tar.gz
diff --git a/CCfits-1.6-removerpath.patch b/CCfits-1.6-removerpath.patch
index 2ad1510..63e21c4 100644
--- a/CCfits-1.6-removerpath.patch
+++ b/CCfits-1.6-removerpath.patch
@@ -1,7 +1,7 @@
-diff -ur CCfits.old/Makefile.in CCfits/Makefile.in
---- CCfits.old/Makefile.in	2006-12-11 18:33:17.000000000 +0100
-+++ CCfits/Makefile.in	2006-12-11 18:32:32.000000000 +0100
-@@ -241,12 +241,12 @@
+diff -ur CCfits/Makefile.in CCfits.rpath/Makefile.in
+--- CCfits/Makefile.in	2009-09-09 17:48:28.000000000 +0200
++++ CCfits.rpath/Makefile.in	2009-09-10 14:28:27.000000000 +0200
+@@ -244,12 +244,12 @@
  # generation like gcc does
  AUTOMAKE_OPTIONS = foreign # no-dependencies
  SUBDIRS = vs.net
@@ -13,14 +13,16 @@ diff -ur CCfits.old/Makefile.in CCfits/Makefile.in
  cookbook_LDADD = libCCfits.la
 -cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
 +cookbook_LDFLAGS = 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = CCfits.pc
  INCLUDES = -I$(top_srcdir)/..
- lib_LTLIBRARIES = libCCfits.la
- libCCfits_la_SOURCES = \
-@@ -273,7 +273,7 @@
+@@ -277,8 +277,8 @@
+ 
  # This will tell shared library which STD C++ library to use without
  # needing the user to use LD_LIBRARY_PATH environment variable
- libCCfits_la_LIBADD = $(LIBSTDCPP)
+-libCCfits_la_LIBADD = $(LIBSTDCPP)
 -libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
++libCCfits_la_LIBADD = 
 +libCCfits_la_LDFLAGS = 
  libCCfits_ladir = $(pkgincludedir)
  libCCfits_la_HEADERS = \
diff --git a/CCfits-includecfitsiopath.patch b/CCfits-includecfitsiopath.patch
deleted file mode 100644
index 6140dcd..0000000
--- a/CCfits-includecfitsiopath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur CCfits/CCfits.h CCfits.new/CCfits.h
---- CCfits/CCfits.h	2008-11-06 17:58:34.000000000 +0100
-+++ CCfits.new/CCfits.h	2008-12-03 15:53:44.000000000 +0100
-@@ -13,7 +13,7 @@
- #define CCFITS_H 1
- 
- // fitsio
--#include "fitsio.h"
-+#include <cfitsio/fitsio.h>
- // string
- #include <string>
- 
-@@ -23,7 +23,7 @@
- } // namespace CCfits
- #include <map>
- #include <sys/types.h>
--#include "longnam.h"
-+#include <cfitsio/longnam.h>
- #include "float.h"
- 
- 
-diff -ur CCfits/FITSBase.h CCfits.new/FITSBase.h
---- CCfits/FITSBase.h	2008-11-06 17:58:34.000000000 +0100
-+++ CCfits.new/FITSBase.h	2008-12-03 15:53:44.000000000 +0100
-@@ -13,7 +13,7 @@
- #define FITSBASE_H 1
- 
- // fitsio
--#include "fitsio.h"
-+#include <cfitsio/fitsio.h>
- // map
- #include <map>
- // string
diff --git a/CCfits-pkgconfig.patch b/CCfits-pkgconfig.patch
new file mode 100644
index 0000000..56b3892
--- /dev/null
+++ b/CCfits-pkgconfig.patch
@@ -0,0 +1,14 @@
+diff -ur CCfits/CCfits.pc.in CCfits.pkg/CCfits.pc.in
+--- CCfits/CCfits.pc.in	2009-09-02 16:34:32.000000000 +0200
++++ CCfits.pkg/CCfits.pc.in	2009-09-10 16:24:41.000000000 +0200
+@@ -5,8 +5,8 @@
+ 
+ Name: CCfits
+ Description: Object Oriented C++ Interface to CFITSIO Library
+-Requires: cfitsio
++Requires.private: cfitsio > 3.08
+ Version: 2.2
+-Libs: -L${libdir} -lCCfits @LIBS@
++Libs: -L${libdir} -lCCfits
+ Cflags: -I${includedir}
+ 
diff --git a/CCfits.spec b/CCfits.spec
index eea9912..207eb51 100644
--- a/CCfits.spec
+++ b/CCfits.spec
@@ -1,6 +1,6 @@
 Name: CCfits
-Version: 2.1
-Release: 5%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -8,10 +8,11 @@ License: BSD
 URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits
 Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz
 Patch0: CCfits-1.6-removerpath.patch
-Patch1: CCfits-includecfitsiopath.patch
+Patch1: CCfits-pkgconfig.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel >= 3.130
+Requires: pkgconfig
 
 %description
 CCfits is an object oriented interface to the cfitsio library. It is designed 
@@ -40,21 +41,18 @@ This package contains the full API documentation for %{name}.
 %setup -q -n CCfits
 %patch0 -p1
 %patch1 -p1
-#%{__sed} -e 's|#include "fitsio.h"|#include <cfitsio/fitsio.h>|g' -i CCfits.h FITSBase.h
-#%{__sed} -e 's|#include "longnam.h"|#include <cfitsio/longnam.h>|g' -i CCfits.h FITSBase.h
-# Remove perl files in html docs
-%{__rm} -rf %{_builddir}/%{name}/html/*.pl
+rm -rf %{_builddir}/%{name}/html/*.pl
 
 %build
 %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} %{?_smp_mflags}  install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make %{?_smp_mflags}  install DESTDIR=%{buildroot}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -70,6 +68,7 @@ This package contains the full API documentation for %{name}.
 %doc CHANGES 
 %exclude %{_bindir}/cookbook
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %exclude %{_libdir}/*.la
 %{_includedir}/*
 
@@ -78,6 +77,9 @@ This package contains the full API documentation for %{name}.
 %doc html
 
 %changelog
+* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
+- New upstream version, includes pkgconfig file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e13311..2892f08 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bb049a22f9ff50ef983633dd270f5dbd  CCfits-2.0.tar.gz
-5ce1135efe2bfcbf7b94e10d1d483c71  CCfits-2.1.tar.gz
+68e07adea9ecfb6aba0ac082111053cf  CCfits-2.2.tar.gz