diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe
index 7a4a295ab..360c1d816 100644
--- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe
+++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe
@@ -1,137 +1,104 @@
+SUMMARY="The X Series 2 Fonts"
 DESCRIPTION="
 X Series 2 fonts are built on freely available fonts and extended to support \
 Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \
 (Ottoman) and modern Turkish (Roman).
 "
 HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2"
-SRC_URI="http://irmug.com/downloads/dl.php?id=21"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f"
+REVISION="3"
+LICENSE="SIL Open Font License v1.1"
+COPYRIGHT="2009 Irmug"
+SRC_URI="http://irmug.com/downloads/dl.php?id=1"
+SRC_FILENAME="Kayhan.zip"
+SRC_URI_2="http://irmug.com/downloads/dl.php?id=2"
+SRC_FILENAME_2="Khoramshahr.zip"
+SRC_URI_3="http://irmug.com/downloads/dl.php?id=3"
+SRC_FILENAME_3="Niloofar.zip"
+SRC_URI_4="http://irmug.com/downloads/dl.php?id=4"
+SRC_FILENAME_4="Paatch.zip"
+SRC_URI_5="http://irmug.com/downloads/dl.php?id=5"
+SRC_FILENAME_5="Riyaz.zip"
+SRC_URI_6="http://irmug.com/downloads/dl.php?id=6"
+SRC_FILENAME_6="Roya.zip"
+SRC_URI_7="http://irmug.com/downloads/dl.php?id=7"
+SRC_FILENAME_7="Shafigh.zip"
+SRC_URI_8="http://irmug.com/downloads/dl.php?id=8"
+SRC_FILENAME_8="Shafigh Uzbek.zip"
+SRC_URI_9="http://irmug.com/downloads/dl.php?id=9"
+SRC_FILENAME_9="Shafigh Kurd.zip"
+SRC_URI_10="http://irmug.com/downloads/dl.php?id=10"
+SRC_FILENAME_10="Shiraz.zip"
+SRC_URI_11="http://irmug.com/downloads/dl.php?id=11"
+SRC_FILENAME_11="Sols.zip"
+SRC_URI_12="http://irmug.com/downloads/dl.php?id=12"
+SRC_FILENAME_12="Tabriz.zip"
+SRC_URI_13="http://irmug.com/downloads/dl.php?id=13"
+SRC_FILENAME_13="Titre.zip"
+SRC_URI_14="http://irmug.com/downloads/dl.php?id=14"
+SRC_FILENAME_14="Traffic.zip"
+SRC_URI_15="http://irmug.com/downloads/dl.php?id=15"
+SRC_FILENAME_15="Vahid.zip"
+SRC_URI_16="http://irmug.com/downloads/dl.php?id=16"
+SRC_FILENAME_16="Vosta.zip"
+SRC_URI_17="http://irmug.com/downloads/dl.php?id=17"
+SRC_FILENAME_17="Yagut.zip"
+SRC_URI_18="http://irmug.com/downloads/dl.php?id=18"
+SRC_FILENAME_18="Yas.zip"
+SRC_URI_19="http://irmug.com/downloads/dl.php?id=19"
+SRC_FILENAME_19="Yekan.zip"
+SRC_URI_20="http://irmug.com/downloads/dl.php?id=20"
+SRC_FILENAME_20="Yermook.zip"
+SRC_URI_21="http://irmug.com/downloads/dl.php?id=21"
+SRC_FILENAME_21="Zar.zip"
+SRC_URI_22="http://irmug.com/downloads/dl.php?id=22"
+SRC_FILENAME_22="Ziba.zip"
+CHECKSUM_SHA256="c82d5a89278f528141b93eab350adfe4cda2d1433d6efb539cfa46134ccaf07f"
+CHECKSUM_SHA256_2="de514505ee0b45167bf2816b8f426b307f2d6252e9658917117de6df7eaa8bab"
+CHECKSUM_SHA256_3="3575302c74b55e6992c0a64b7d4a193c0dc8a95fe8ea62d06959ce4586bf90a6"
+CHECKSUM_SHA256_4="6db9f506f2e427c731a2bb6538c4c3e579ac145b682cebe7d7651f7f72c837f9"
+CHECKSUM_SHA256_5="85fa5bc42bec3976af3731756b533fdb7339375c57b2cb10b262c5f788c53826"
+CHECKSUM_SHA256_6="26658db74a08855f793e15acec7940d1d7b2da84a7e3ed064c1458a7a412751e"
+CHECKSUM_SHA256_7="9ca90be08cefa52aa48e7ab42d0b2bcce39cd612507ff565c4dab7456a8dcdfc"
+CHECKSUM_SHA256_8="ae7fd73e1b9394961d98493cdd3d791011025aeacd0de4e12d2e6eb4032ff549"
+CHECKSUM_SHA256_9="06dccdee05a8a4fe4869a8ff6dd1acb008f50c9e2a24eee3eab577b2cb81d8b0"
+CHECKSUM_SHA256_10="6d0d6b35684e04431a4ff632985549b7d6c6a064a2e4ba3e98237040a2cb9198"
+CHECKSUM_SHA256_11="009efb2f958ee1b78253c784c6fa4f07a0d1f7277a1b2530a664c021cb2b55e5"
+CHECKSUM_SHA256_12="59b6314928ced07b67607aa67c756074764cf0fd91fe99f96e46f512cfb413a5"
+CHECKSUM_SHA256_13="8ea816bc857aa3a17293726997c4a37132d5f5570ed1eeb459793950d8e70bb4"
+CHECKSUM_SHA256_14="9f280efbfa42144a8d9cc9aa9bb4994b739281050b214ddd4bd86b1d425768d7"
+CHECKSUM_SHA256_15="88bdf86e2b2d53cb2e6b2319f36ad13324c4804547f758f425dc042d7077c102"
+CHECKSUM_SHA256_16="86727d4cee40812fb45e3741d68ca75725806d21db272c0850f70821a70f1169"
+CHECKSUM_SHA256_17="6175494252e997fac2ab8f7a1b85bf3cc522cf0bc7be7e001a9f7ba1db906766"
+CHECKSUM_SHA256_18="8d1d5462a1c902c074b18708b6eddfed2a11f0f7aacc126170ae3f61560e6661"
+CHECKSUM_SHA256_19="b23e2f7c2a1e4a8b63850d7e9e804ff533ce5968f86ea5df57f850a5cf58785c"
+CHECKSUM_SHA256_20="c86f8e8255a178434e937c19d8cf3f36de688d59c9cf471923df18795eead06f"
+CHECKSUM_SHA256_21="a44aada3f79583c5eacc7f927414e692d523d7c84e2b6b0e3b7a06747cf41aa9"
+CHECKSUM_SHA256_22="fdbf29bdcd5b7b1b34c5fd8da654d29291d824c65058c9796225af08c003dd77"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE=yes
+
+PROVIDES="x_series_fonts = $portVersion"
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="
+	coreutils
+	cmd:find
+"
+
+SOURCE_DIR=""
+
 BUILD()
 {
-	cd Zar
+	true
 }
 
 INSTALL()
 {
 	FONTDIR=${fontsDir}/ttfonts
 	mkdir -p ${FONTDIR}
-	wget http://irmug.com/downloads/dl.php?id=21
-	unzip -o Zar.zip
-	cd Zar
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=3
-	unzip -o Niloofar.zip
-	cd Niloofar
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=2
-	unzip -o Khoramshahr.zip
-	cd Khoramshahr
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://www.irmug.com/downloads/dl.php?id=1
-	unzip -o Kayhan.zip
-	cd Kayhan
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=17
-	unzip -o Yagut.zip
-	cd Yagut
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=5
-	unzip -o Riyaz.zip
-	cd Riyaz
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=6
-	unzip -o Roya.zip
-	cd Roya
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=7
-	unzip -o Shafigh.zip
-	cd Shafigh
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=9
-	unzip -o "Shafigh Kurd.zip"
-	cd "Shafigh Kurd"
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=8
-	unzip -o "Shafigh Uzbek.zip"
-	cd "Shafigh Uzbek"
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=10
-	unzip -o Shiraz.zip
-	cd Shiraz
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=11
-	unzip -o Sols.zip
-	cd Sols
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=12
-	unzip -o Tabriz.zip
-	cd Tabriz
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=13
-	unzip -o Titre.zip
-	cd Titre
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=14
-	unzip -o Traffic.zip
-	cd Traffic
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=4
-	unzip -o Paatch.zip
-	cd Paatch
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=15
-	unzip -o Vahid.zip
-	cd Vahid
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=16
-	unzip -o Vosta.zip
-	cd Vosta
-	cp -f *.ttf ${FONTDIR}/
-
-	wget http://irmug.com/downloads/dl.php?id=19
-	unzip -o Yekan.zip
-	cd Yekan
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=20
-	unzip -o Yermook.zip
-	cd Yermook
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=18
-	unzip -o Yas.zip
-	cd Yas
-	cp -f *.ttf ${FONTDIR}/
-	
-	wget http://irmug.com/downloads/dl.php?id=22
-	unzip -o Ziba.zip
-	cd Ziba
-	cp -f *.ttf ${FONTDIR}/
-	
-	
-	
-	
+	# http://askubuntu.com/questions/343727/filenames-with-spaces-breaking-for-loop-find-command
+	find ../sources* -type f -name '*.ttf' -print0 | while IFS= read -r -d '' file; do
+		cp "`printf '%s' "$file"`" ${FONTDIR}
+	done
 }
-
-LICENSE="GNU GPL v2"
-#COPYRIGHT=""