diff --git a/65-madan.conf b/65-madan.conf
new file mode 100644
index 0000000..3feac83
--- /dev/null
+++ b/65-madan.conf
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- font remapping/renaming overrides -->
+
+  <match target="scan">
+    <test name="family">
+      <string>Madan2</string>
+    </test>
+    <edit name="family">
+      <string>Madan</string>
+    </edit>
+    <edit name="fullname">
+      <string>Madan</string>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Madan2</family>
+    <accept>
+      <family>Madan</family>
+    </accept>
+  </alias>
+
+<!-- locale-specific overrides -->
+
+<match>
+  <test name="lang">
+    <string>ne-np</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend" >
+    <string>Madan</string>
+  </edit>
+</match>
+
+</fontconfig>
diff --git a/madan-fonts.spec b/madan-fonts.spec
index 54f0e61..d1f6f3e 100644
--- a/madan-fonts.spec
+++ b/madan-fonts.spec
@@ -1,16 +1,17 @@
-%define fontdir %{_datadir}/fonts/madan
-%define fontname madan
+%global fontname madan
+%global fontconf 65-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.0
-Release: 11%{?dist}
+Version: 2.000
+Release: 2%{?dist}
 Summary: Font for Nepali language
 Group: User Interface/X
-# No version specified.
 License: GPL+
-# upstream link is dead. While I work on new release lets fix this for now.
 URL: http://madanpuraskar.org/
-Source: Madan.ttf
+#Note if downloading this URL using wget,move this file to madan.zip
+#Source0: http://madanpuraskar.org/index.php?option=com_docman&task=doc_download&gid=8&Itemid=63
+Source0: madan.zip
+Source1: %{fontconf}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fontpackages-devel
@@ -21,8 +22,13 @@ This package provides the Madan font for Nepali made by the
 Madan Puraskar Pustakalaya project.
 
 %prep
-%setup -c -T
-cp -p %{SOURCE0} .
+%setup -c -q
+for file in madan/license.txt; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
 
 %build
 echo "Nothing to do in Build."
@@ -30,15 +36,33 @@ echo "Nothing to do in Build."
 %install
 rm -rf %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p %{fontname}/*.ttf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 %clean
 rm -rf %{buildroot}
 
-%_font_pkg  *.ttf
+%_font_pkg -f %{fontconf} *.ttf
+%doc %{fontname}/license.txt
+
 
 %changelog
+* Tue Apr 20 2010 Parag <pnemade AT redhat.com> - 2.000-2
+- Resolves: rh#578041-lang-specific overrides rule doesn't work as expected
+
+* Tue Feb 23 2010 Parag <pnemade AT redhat.com> - 2.000-1
+- Update to next upstream release
+- Resolves: rh#335851-[ne_NP] Add license text file to madan-fonts package
+- Resolves: rh#520047-[ne_NP] Need fontconfig rules for Madan font
+
 * Tue Aug 11 2009 Parag <pnemade@redhat.com> - 1.0-11
 - Fix source audit 2009-08-10
 
diff --git a/sources b/sources
index ed02e5a..36c59b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d78a34b1d46dcfa74ff64e78dcc1fc31  Madan.ttf
+8d1b035f8b2a90a0426df5f8fe2fe976  madan.zip