diff -pruN 1.2-5/90-fonts-nafees.conf 1.2-5ubuntu1/90-fonts-nafees.conf
--- 1.2-5/90-fonts-nafees.conf	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/90-fonts-nafees.conf	2014-04-07 15:42:58.000000000 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ur</string>
+		</test>
+		<test qual="any" name="family">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Nafees Nastaleeq</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ur</string>
+		</test>
+		<test qual="any" name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Nafees Nastaleeq</string>
+		</edit>
+	</match>
+</fontconfig>
diff -pruN 1.2-5/debian/changelog 1.2-5ubuntu1/debian/changelog
--- 1.2-5/debian/changelog	2014-01-05 13:58:38.000000000 +0000
+++ 1.2-5ubuntu1/debian/changelog	2014-04-07 10:57:49.000000000 +0000
@@ -1,3 +1,16 @@
+fonts-nafees (1.2-5ubuntu1) trusty; urgency=low
+
+  [ Gunnar Hjalmarsson ]
+  * debian/extras/NafeesNastaleeq.ttf:
+    - Nafees Nastaleeq added.
+  * debian/patches/fontconfig-recipe.patch:
+    - Make Nafees Nastaleeq the preferred font for Urdu (LP: #1153188).
+
+  [ Iain Lane ]
+  * Add Nastaleeq license to d/copyright
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 07 Apr 2014 11:57:49 +0100
+
 fonts-nafees (1.2-5) unstable; urgency=low
 
   * Update Standards to 3.9.5 (checked)
diff -pruN 1.2-5/debian/control 1.2-5ubuntu1/debian/control
--- 1.2-5/debian/control	2014-01-05 13:58:24.000000000 +0000
+++ 1.2-5ubuntu1/debian/control	2014-04-07 10:19:35.000000000 +0000
@@ -1,8 +1,8 @@
 Source: fonts-nafees
 Section: fonts
 Priority: optional
-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
-Uploaders: Christian Perrier <bubulle@debian.org>, Mohammed Adnène Trojette <adn+deb@diwi.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9~)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-fonts/fonts-nafees.git
diff -pruN 1.2-5/debian/copyright 1.2-5ubuntu1/debian/copyright
--- 1.2-5/debian/copyright	2014-01-05 13:58:24.000000000 +0000
+++ 1.2-5ubuntu1/debian/copyright	2014-04-07 10:57:22.000000000 +0000
@@ -6,8 +6,6 @@ The current Debian maintainer is Mohamme
 
 It was downloaded from http://www.crulp.org/nafeesWebNaskh.html
 
-Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved.
-
 These fonts are free; you can redistribute them and/or modify them under
 the terms  of the GNU  General Public License  as published by  the Free
 Software Foundation; either version 2 of the License.
@@ -26,6 +24,60 @@ Software Foundation; either version 2 of
 On Debian systems, the complete text of the GNU General Public
 License, version 2, can be found in /usr/share/common-licenses/GPL-2.
 
+The file NafeesNastaleeq.ttf, which was added to the Ubuntu
+version of this package, was downloaded from
+http://www.cle.org.pk/software/localization/Fonts/nafeesNastaleeq.html
+
+It is licensed under the following terms:
+
+Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP),
+National University of Computer and Emerging Sciences, Lahore, Pakistan. All
+Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+the font accompanying this license (“Font”) and associated documentation files
+(the “Font Software”), to reproduce and distribute the Font Software, including
+without limitation the rights to use, copy, merge, publish, distribute, and/or
+sell copies of the Font Software, and to permit persons to whom the Font
+Software is furnished to do so, subject to the following conditions:
+
+1. The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+2. The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and additional
+glyphs or characters may be added to the Fonts, only if the font is renamed to
+names not containing either the words “Nafees” or the word “CRULP”.
+
+3. This License becomes null and void to the extent applicable to Font or Font
+Software that has been modified and is distributed under the “Nafees Nastaleeq”
+names.
+
+4. The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+5. The font software is provided "as is", without warranty of any kind, express
+or implied, including but not limited to any warranties of merchantability,
+fitness for a particular purpose and noninfringement of copyright, patent,
+trademark, or other right. In no event shall CRULP or NUCES be liable for any
+claim, damages or other liability, including any general, special, indirect,
+incidental, or consequential damages, whether in an action of contract, or
+otherwise, arising from, out of the use or inability to use the font software
+or from other dealings in the font software.
+
+6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization from CRULP.
+
+7. As a special exception, if you create a document which uses this font, and
+embed this font or unaltered portions of this font into the document, this font
+does not by itself cause the resulting document to  be covered by the GNU
+General Public License. This exception does not however invalidate any other
+reasons why the document might be covered by the GNU General Public License. If
+you modify this font, you may extend this exception to your version of the
+font, but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version.
+
 The current Debian packaging is (C) 2006, Mohammed Adnène Trojette
 <adn+deb@diwi.org> and is licensed under the GPL, see above.
 
Binary files 1.2-5/debian/extras/NafeesNastaleeq.ttf and 1.2-5ubuntu1/debian/extras/NafeesNastaleeq.ttf differ
diff -pruN 1.2-5/debian/fonts-nafees.install 1.2-5ubuntu1/debian/fonts-nafees.install
--- 1.2-5/debian/fonts-nafees.install	2014-01-05 13:58:24.000000000 +0000
+++ 1.2-5ubuntu1/debian/fonts-nafees.install	2014-04-07 10:19:35.000000000 +0000
@@ -1 +1,3 @@
 *.ttf usr/share/fonts/truetype/fonts-nafees
+debian/extras/*.ttf usr/share/fonts/truetype/fonts-nafees
+*.conf etc/fonts/conf.avail
diff -pruN 1.2-5/debian/fonts-nafees.links 1.2-5ubuntu1/debian/fonts-nafees.links
--- 1.2-5/debian/fonts-nafees.links	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/debian/fonts-nafees.links	2014-04-07 10:19:35.000000000 +0000
@@ -0,0 +1 @@
+etc/fonts/conf.avail/90-fonts-nafees.conf etc/fonts/conf.d/90-fonts-nafees.conf
diff -pruN 1.2-5/debian/patches/fontconfig-recipe.patch 1.2-5ubuntu1/debian/patches/fontconfig-recipe.patch
--- 1.2-5/debian/patches/fontconfig-recipe.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/debian/patches/fontconfig-recipe.patch	2014-04-07 10:19:35.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Make Nafees Nastaleeq the preferred font for Urdu
+Bug-Ubuntu: https://launchpad.net/bugs/1153188
+Bug-Debian: https://bugs.debian.org/703456
+ That bug is not really a forward of this patch. So far it's rather a
+ discussion with Debian about adding the related .ttf file to begin with.
+ The plan is to sort things out with upstream after the 14.04 release.
+Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+
+--- fonts-nafees-1.2.orig/90-fonts-nafees.conf	1970-01-01 01:00:00.000000000 +0100
++++ fonts-nafees-1.2/90-fonts-nafees.conf	2014-03-26 17:04:35.042119545 +0100
+@@ -0,0 +1,27 @@
++<?xml version="1.0"?>
++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
++<fontconfig>
++	<match target="pattern">
++		<test name="lang" compare="contains">
++			<string>ur</string>
++		</test>
++		<test qual="any" name="family">
++			<string>sans-serif</string>
++		</test>
++		<edit name="family" mode="prepend" binding="strong">
++			<string>Nafees Nastaleeq</string>
++		</edit>
++	</match>
++
++	<match target="pattern">
++		<test name="lang" compare="contains">
++			<string>ur</string>
++		</test>
++		<test qual="any" name="family">
++			<string>serif</string>
++		</test>
++		<edit name="family" mode="prepend" binding="strong">
++			<string>Nafees Nastaleeq</string>
++		</edit>
++	</match>
++</fontconfig>
diff -pruN 1.2-5/debian/patches/series 1.2-5ubuntu1/debian/patches/series
--- 1.2-5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/debian/patches/series	2014-04-07 10:19:35.000000000 +0000
@@ -0,0 +1 @@
+fontconfig-recipe.patch
diff -pruN 1.2-5/debian/source/include-binaries 1.2-5ubuntu1/debian/source/include-binaries
--- 1.2-5/debian/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/debian/source/include-binaries	2014-04-07 10:19:35.000000000 +0000
@@ -0,0 +1 @@
+debian/extras/NafeesNastaleeq.ttf
diff -pruN 1.2-5/.pc/applied-patches 1.2-5ubuntu1/.pc/applied-patches
--- 1.2-5/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ 1.2-5ubuntu1/.pc/applied-patches	2014-04-07 15:42:58.364304640 +0000
@@ -0,0 +1 @@
+fontconfig-recipe.patch
