diff --git a/.gitignore b/.gitignore
index 8ca8870..5b817de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 c08.00.tar.gz
 cloudy_no_date_footer.tar.gz
+/c13.03.tar.gz
diff --git a/cloudy.spec b/cloudy.spec
index a267683..b79abd4 100644
--- a/cloudy.spec
+++ b/cloudy.spec
@@ -1,21 +1,24 @@
 Name: cloudy
-Version: 08.00
-Release: 9%{?dist}
+Version: 13.03
+Release: 1%{?dist}
 Summary: Spectral synthesis code to simulate conditions in interstellar matter
 
 
 Group: Applications/Engineering
 License: BSD
 URL: http://www.nublado.org/
-Source0: ftp://gradj.pa.uky.edu/gary/cloudy_gold/c%{version}.tar.gz
+Source0: http://data.nublado.org/cloudy_releases/c13/c%{version}.tar.gz
 Source1: cloudy_no_date_footer.tar.gz
 Patch0: cloudy-doxygen.patch
 Patch1: cloudy-shared.patch
 Patch2: cloudy-fmterr.patch
 
-Requires: %{name}-libs = %{version}-%{release}
+Obsoletes: cloudy <  08.00-10
+Obsoletes: cloudy-devel <  08.00-10
+Obsoletes: cloudy-devel-doc <  08.00-10
+Obsoletes: cloudy-libs <  08.00-10
 
-BuildRequires: doxygen graphviz tetex-latex
+Requires: %{name}-data = %{version}-%{release}
 
 %description
 Most of the quantitative information we have about the cosmos comes from 
@@ -29,103 +32,63 @@ needed to understand their physical properties. Numerical simulations make
 it possible to understand complex physical environments starting from 
 first principles. Cloudy is designed to do exactly this.
 
-%package devel
-Summary: Headers for developing programs that will use %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-These are the header files and libraries needed to develop a %{name} 
-application.
-
-%package libs
-Summary: Cloudy runtime libraries
-Group: System Environment/Libraries
-%description libs
-Cloudy is a Spectral synthesis code to simulate conditions in 
-interstellar matter. This package contains the %{name} run-time library
+%package data
+Summary: data %{name}
+BuildArch: noarch
+ 
+%description data
+This package contains the atomic data for %{name}.
 
 %package doc
 Summary: Documentation for %{name}
-Group: Documentation
 BuildArch: noarch
  
 %description doc
 This package contains the usage documentation for %{name}.
 
-%package devel-doc
-Summary: Developer documentation for %{name}
-Group: Documentation
-BuildArch: noarch
- 
-%description devel-doc
-Developer documentation for %{name}
-
 %prep
 %setup -q -n c%{version}
-%setup -q -n c%{version} -T -D -a 1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-chmod +x source/precompile.pl
+#%setup -q -n c%{version} -T -D -a 1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+#chmod +x source/precompile.pl
 
 %build
 cd source
 make %{?_smp_mflags} CXX="%{__cxx}" CXXFLAGS="%{optflags}" \
     CLOUDY_DATA_PATH=%{_datadir}/%{name}/data/
-cd ..
-cd doxygen
-doxygen Doxyfile
-# Deleting empty files
-find -empty -exec rm '{}' ';'
-# Spurious file
-find -name installdox -exec rm '{}' ';'
 
 %install
 mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_libdir}
-mkdir -p %{buildroot}/%{_includedir}/%{name}
-mkdir -p %{buildroot}/%{_datadir}/%{name}/data
 mkdir -p %{buildroot}/%{_datadir}/%{name}/scripts
 mkdir -p %{buildroot}/%{_datadir}/%{name}/grain
-install -m 755 source/cloudy.exe %{buildroot}/%{_bindir}/cloudy
-install -m 755 source/libcloudy.so.* %{buildroot}/%{_libdir}
-cp -a source/libcloudy.so %{buildroot}/%{_libdir}
-cp -a source/cddefines.h %{buildroot}/%{_includedir}/%{name}
-cp -a source/cpu.h %{buildroot}/%{_includedir}/%{name}
-cp -a source/cddrive.h %{buildroot}/%{_includedir}/%{name}
-cp -a data/*.opc %{buildroot}/%{_datadir}/%{name}/data
-cp -a data/*.ini %{buildroot}/%{_datadir}/%{name}/data
-cp -a data/*.dat %{buildroot}/%{_datadir}/%{name}/data
-cp -a data/*.rfi %{buildroot}/%{_datadir}/%{name}/grain
-cp -a data/*.szd %{buildroot}/%{_datadir}/%{name}/grain
-cp -a data/*.in %{buildroot}/%{_datadir}/%{name}/scripts
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+install -m 755 source/cloudy.exe %{buildroot}/%{_bindir}
+cp -a data/ %{buildroot}/%{_datadir}/%{name}/
+rm -rf %{buildroot}/%{_datadir}/%{name}/data/cdms+jpl/convert_calpgm
+rm -rf %{buildroot}/%{_datadir}/%{name}/data/cdms+jpl/convert_calpgm.cpp
+rm -rf %{buildroot}/%{_datadir}/%{name}/data/cdms+jpl/.gitignore
+
+%check
+echo "test" > test.in
+export CLOUDY_DATA_PATH="%{buildroot}/%{_datadir}/%{name}/data/"
+%{buildroot}/%{_bindir}/cloudy.exe -r test
 
 %files
-%doc readme.txt
+%doc readme.txt license.txt 
 %{_bindir}/*
 
-%files doc
-%doc license.txt docs/* 
-
-%files libs
-%doc license.txt data/readme_data.htm data/readme_LineList_dat.txt
-%{_libdir}/lib%{name}.so.*
+%files data
+%doc data/readme_data.htm data/readme_LineList_dat.txt
 %{_datadir}/%{name}
 
-%files devel
-%doc license.txt 
-%{_includedir}/%{name}
-%{_libdir}/lib%{name}.so
-
-%files devel-doc
-%doc license.txt doxygen/html
+%files doc
+%doc license.txt docs/* 
 
 %changelog
+* Tue Feb 04 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 13.03-1
+- New upstream version
+
 * Wed Jan 22 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 08.00-9
 - Updated macros
 - Fix bz #1037017, format security error
diff --git a/sources b/sources
index e4b10e3..e01d971 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d1488735de2eba1a347de03015c3fa9f  c08.00.tar.gz
-98ac4a08813e89789bda1ab0c2dbb6b0  cloudy_no_date_footer.tar.gz
+eed0ae7432e2f9520e10d5e2bdb78bef  c13.03.tar.gz