diff --git a/.gitignore b/.gitignore
index 4b934c8..c83962d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 NaskhBasic-3.0.tar.gz
+/PakType-Naskh-Basic-3.1.tar.gz
diff --git a/paktype-naskh-basic-fonts.spec b/paktype-naskh-basic-fonts.spec
index eed2f41..caf8fa3 100644
--- a/paktype-naskh-basic-fonts.spec
+++ b/paktype-naskh-basic-fonts.spec
@@ -1,6 +1,5 @@
-%define fontname paktype-naskh-basic
+%global fontname paktype-naskh-basic
 %global fontconf 67-%{fontname}
-%define fontdir %{_datadir}/fonts/%{fontname}
 
 # Common description
 %define common_desc \
@@ -8,17 +7,16 @@ The paktype-naskh-basic-fonts package contains fonts for the display of \
 Arabic, Farsi, Urdu and Sindhi from PakType by Lateef Sagar.
 
 Name:    %{fontname}-fonts
-Version: 3.0
-Release: 11%{?dist}
+Version: 3.1
+Release: 1%{?dist}
 License: GPLv2 with exceptions
 URL: https://sourceforge.net/projects/paktype/
-Source0: http://downloads.sourceforge.net/project/paktype/NaskhBasic-3.0.tar.gz
+Source0: http://citylan.dl.sourceforge.net/project/paktype/Individual-Release/PakType-Naskh-Basic-3.1.tar.gz
 Source1: %{fontconf}-sa.conf
 Source2: %{fontconf}-sindhi.conf
 Source3: %{fontconf}-farsi.conf
 Source4: %{fontconf}-urdu.conf
 Source5: %{fontconf}.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires:  fontpackages-devel
 Requires:       %{name}-common 
@@ -80,30 +78,22 @@ This package provides a free Urdu truetype/opentype font
 
 %prep
 %setup -q -c
-mv NaskhBasic-3.0/* .
-mv Ready\ to\ use\ fonts/* .
+rm -rf Code
 mv PakType\ Naskh\ Basic\ Farsi.ttf PakTypeNaskhBasicFarsi.ttf
 mv PakType\ Naskh\ Basic.ttf PakTypeNaskhBasic.ttf
 mv PakType\ Naskh\ Basic\ SA.ttf PakTypeNaskhBasicSA.ttf
 mv PakType\ Naskh\ Basic\ Urdu.ttf PakTypeNaskhBasicUrdu.ttf
 mv PakType\ Naskh\ Basic\ Sindhi.ttf PakTypeNaskhBasicSindhi.ttf
-mv License\ files/* .
-mv PakType\ Naskh\ Basic\ Comparison\ Chart.htm  PakType_Naskh_Basic_Comparison_Chart.htm
-mv PakType\ Naskh\ Basic\ Comparison\ Chart.pdf PakType_Naskh_Basic_Comparison_Chart.pdf
-%{__sed} -i 's/\r//'  PakType_Naskh_Basic_Comparison_Chart.htm
+
+mv Features/PakType\ Naskh\ Basic\ Farsi\ Features.pdf PakTypeNaskhBasicFarsiFeatures.pdf
+mv Features/PakType\ Naskh\ Basic\ Features.pdf PakTypeNaskhBasicFeatures.pdf
+mv Features/PakType\ Naskh\ Basic\ SA\ Features.pdf PakTypeNaskhBasicSAFeatures.pdf
+mv Features/PakType\ Naskh\ Basic\ Sindhi\ Features.pdf PakTypeNaskhBasicSindhiFeatures.pdf
+mv Features/PakType\ Naskh\ Basic\ Urdu\ Features.pdf PakTypeNaskhBasicUrduFeatures.pdf
+
 mv PakType\ Naskh\ Basic\ License.txt  PakType_Naskh_Basic_License.txt
 %{__sed} -i 's/\r//' PakType_Naskh_Basic_License.txt
-chmod a-x PakType_Naskh_Basic_Comparison_Chart.htm PakType_Naskh_Basic_License.txt PakType_Naskh_Basic_Comparison_Chart.pdf
-for txt in Readme.txt ; do
-   fold -s $txt > $txt.new
-   sed -i 's/\x92//g' $txt.new
-   sed -i 's/\x93//g' $txt.new
-   sed -i 's/\x94//g' $txt.new
-   sed -i 's/\x96//g' $txt.new
-   sed -i 's/\r//' $txt.new
-   touch -r $txt $txt.new
-   mv $txt.new $txt
-done
+chmod a-x PakTypeNaskhBasicFarsiFeatures.pdf PakType_Naskh_Basic_License.txt PakTypeNaskhBasicSindhiFeatures.pdf PakTypeNaskhBasicFeatures.pdf PakTypeNaskhBasicSAFeatures.pdf PakTypeNaskhBasicUrduFeatures.pdf
 
 %build
 echo "Nothing to do in Build."
@@ -143,18 +133,16 @@ for fconf in %{fontconf}-sa.conf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files common
 %defattr(-,root,root,-)
-%dir %{fontdir}
-%doc PakType_Naskh_Basic_Comparison_Chart.htm PakType_Naskh_Basic_License.txt PakType_Naskh_Basic_Comparison_Chart.pdf Readme.txt
+%dir %{_fontdir}
+%doc PakType_Naskh_Basic_License.txt PakTypeNaskhBasicFarsiFeatures.pdf PakTypeNaskhBasicFeatures.pdf PakTypeNaskhBasicSAFeatures.pdf PakTypeNaskhBasicUrduFeatures.pdf PakTypeNaskhBasicSindhiFeatures.pdf
+
 
 %changelog
+* Mon Sep 03 2012 Naveen Kumar <nkumar@redhat.com> - 3.1-1
+- Upstream 3.1 release
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 3d7c403..880a397 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-407b095967ceecc4a342355295dd8c83  NaskhBasic-3.0.tar.gz
+41c300c722f2dd80d2b04588a325a144  PakType-Naskh-Basic-3.1.tar.gz