diff --git a/cfitsio-pkgconfig.patch b/cfitsio-pkgconfig.patch
index 276feb8..c8e81da 100644
--- a/cfitsio-pkgconfig.patch
+++ b/cfitsio-pkgconfig.patch
@@ -1,11 +1,19 @@
 diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in
 --- cfitsio/cfitsio.pc.in	2013-04-08 20:11:56.000000000 +0200
-+++ cfitsio.new/cfitsio.pc.in	2013-07-10 18:28:36.698569315 +0200
-@@ -7,5 +7,5 @@
++++ cfitsio.new/cfitsio.pc.in	2013-07-10 18:42:11.105358864 +0200
+@@ -1,11 +1,11 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/cfitsio
+ 
+ Name: cfitsio
  Description: FITS File Subroutine Library
  Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
- Libs: -L${libdir} -lcfitsio @LIBS@
+-Libs: -L${libdir} -lcfitsio @LIBS@
 -Libs.private: -lm
 -Cflags: -I${includedir}
++Libs: -L${libdir} -lcfitsio
 +Libs.private: -lm -lz @LIBS@
-+Cflags: -I${includedir} -D_REENTRANT
++Cflags: -D_REENTRANT -I${includedir}
diff --git a/cfitsio.spec b/cfitsio.spec
index 8926d46..6060e48 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -103,10 +103,10 @@ cmp -s testprog.fit testprog.std
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_includedir}
-make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir} \
+mkdir -p %{buildroot}%{_includedir}/%{name}
+make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
  CFITSIO_LIB=%{buildroot}%{_libdir} \
- CFITSIO_INCLUDE=%{buildroot}%{_includedir} \
+ CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
 install
 # make is not installing properly the shared libs
 cp -d libcfitsio.so.* %{buildroot}%{_libdir}
@@ -123,7 +123,7 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 %{_libdir}/libcfitsio.so.*
 
 %files devel
-%{_includedir}/*.h
+%{_includedir}/%{name}
 %{_libdir}/libcfitsio.so
 %{_libdir}/pkgconfig/cfitsio.pc
 
@@ -143,7 +143,6 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 * Wed Jul 03 2013 Sergio Pascual <sergiopr@fedoraproject.org> - 3.350-1
 - New upstream source (3.350)
 - Upstream provides soname
-- Removed namespaced includedir (not in upstream)
 - pkgconfig file rearrangement now a patch instead of using sed
 
 * Thu Mar 21 2013 Sergio Pascual <sergiopr@fedoraproject.org> - 3.340-1