diff --git a/67-paktype-naskh-basic-sa.conf b/67-paktype-naskh-basic-sa.conf
index 6e7e644..3146d1a 100644
--- a/67-paktype-naskh-basic-sa.conf
+++ b/67-paktype-naskh-basic-sa.conf
@@ -1,16 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
+<match>
+  <test name="lang">
+    <string>pa-pk</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Naskh Basic SA</string>
+  </edit>
+</match>
+
+<match>
+  <test name="lang">
+    <string>ur-pk</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Naskh Basic SA</string>
+  </edit>
+</match>
+
+<match>
+  <test name="lang">
+    <string>ur-in</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Naskh Basic SA</string>
+  </edit>
+</match>
+
+<alias>
+  <family>PakType Naskh Basic SA</family>
+  <default>
     <family>sans-serif</family>
-    <prefer>
-      <family>PakType Naskh Basic SA</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>PakType Naskh Basic SA</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>                       
+  </default>
+</alias>
+</fontconfig>
+
diff --git a/67-paktype-naskh-basic.conf b/67-paktype-naskh-basic.conf
index 99d7c9e..1e7b48d 100644
--- a/67-paktype-naskh-basic.conf
+++ b/67-paktype-naskh-basic.conf
@@ -1,16 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
+<match>
+  <test name="lang">
+    <string>pa-pk</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Nashk Basic</string>
+  </edit>
+</match>
+
+<match>
+  <test name="lang">
+    <string>ur-pk</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Nashk Basic</string>
+  </edit>
+</match>
+
+<match>
+  <test name="lang">
+    <string>ur-in</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Nashk Basic</string>
+  </edit>
+</match>
+
+<alias>
+  <family>PakType Nashk Basic</family>
+  <default>
     <family>sans-serif</family>
-    <prefer>
-      <family>PakType Naskh Basic</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>PakType Naskh Basic</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>                       
+  </default>
+</alias>
+</fontconfig>
+
diff --git a/paktype-naskh-basic-fonts.spec b/paktype-naskh-basic-fonts.spec
index f3e3051..276b855 100644
--- a/paktype-naskh-basic-fonts.spec
+++ b/paktype-naskh-basic-fonts.spec
@@ -9,7 +9,7 @@ Arabic, Farsi, Urdu and Sindhi from PakType by Lateef Sagar.
 
 Name:    %{fontname}-fonts
 Version: 3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2 with exceptions
 URL: https://sourceforge.net/projects/paktype/
 Source0: http://downloads.sourceforge.net/project/paktype/NaskhBasic-3.0.tar.gz
@@ -155,6 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc PakType_Naskh_Basic_Comparison_Chart.htm PakType_Naskh_Basic_License.txt PakType_Naskh_Basic_Comparison_Chart.pdf Readme.txt
 
 %changelog
+* Mon Jun 21 2010 Naveen Kumar <nkumar@redhat.com> - 3.0-8
+- add ur-in, ur-pk & pa-pk locale-specific overrides rule in 67-paktype-naskh-basic.conf
+- add ur-in, ur-pk & pa-pk locale-specific overrides rule in 67-paktype-naskh-basic-sa.conf
+- resolves bug #586789
+
 * Thu May 6 2010 Naveen Kumar <nkumar@redhat.com> - 3.0-7
 - remove binding="same" from all *.conf files