diff --git a/tests/popt/pspec.xml b/tests/popt/pspec.xml
index fe2782ea..a1313bfd 100644
--- a/tests/popt/pspec.xml
+++ b/tests/popt/pspec.xml
@@ -1,75 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-
-<!DOCTYPE PSPEC SYSTEM
-      "http://www.uludag.org.tr/projeler/pisi/pisi-spec.dtd">
-
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
 <PISI>
+    <Source>
+        <Name>popt</Name>
+        <Homepage>http://www.rpm.org/</Homepage>
+        <Packager>
+            <Name>Kırmızı kafalar</Name>
+            <Email>hotmail@redhat.com</Email>
+        </Packager>
+        <License>as-is</License>
+        <IsA>app:console</IsA>
+        <Summary>Popt command line option parser</Summary>
+        <Description>Command line option parsing library.
+        While it is similiar to getopt(3), it contains a number of enhancements, including:
 
-  <Source>
-    <Name>popt</Name>
-    <Homepage>http://www.rpm.org/</Homepage>
-    <Packager>
-      <Name>Kırmızı kafalar</Name>
-      <Email>hotmail@redhat.com</Email>
-    </Packager>
-    <License>As-Is</License>
-    <IsA>library:util:optparser</IsA>
-    <PartOf>rpm:archive</PartOf>
-    <Summary>Popt command line option parser</Summary>
-    <Description>Command line option parsing library.
-      While it is similiar to getopt(3), it contains a number of enhancements, including:
+        1) popt is fully reentrant
+        2) popt can parse arbitrary argv[] style arrays while 
+            getopt(2) makes this quite difficult
+        3) popt allows users to alias command line arguments
+        4) popt provides convience functions for parsing strings
+            into argv[] style arrays
+        </Description>
+        <Archive sha1sum="66f3c77b87a160951b180447f4a6dce68ad2f71b" type="targz">ftp://ftp.pardus.org.tr/pub/pisi/source/popt-1.7.tar.gz</Archive>
+    </Source>
 
-    1) popt is fully reentrant
-    2) popt can parse arbitrary argv[] style arrays while 
-       getopt(2) makes this quite difficult
-    3) popt allows users to alias command line arguments
-    4) popt provides convience functions for parsing strings
-       into argv[] style arrays
-    </Description>
-    <Archive type="targz" sha1sum="66f3c77b87a160951b180447f4a6dce68ad2f71b">
-      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz
-    </Archive>
-    <Patches>
-      <Patch compressionType="gz" level="1">popt-1.7-uclibc.patch.gz</Patch>
-    </Patches>
-    <BuildDependencies>
-      <Dependency versionFrom="1.8"> make </Dependency>
-    </BuildDependencies>
-  </Source>
+    <Package>
+        <Name>popt</Name>
+        <Description>library files for popt</Description>
+        <Summary>Command line option parsing library</Summary>
+        <Summary xml:lang="tr">Komut satırı seçenekleri işleme kütüphanesi</Summary>
+        <RuntimeDependencies>
+            <Dependency>gettext</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="header">/usr/include/popt.h</Path>
+        </Files>
+    </Package>
 
-  <Package>
-    <Name>popt-libs</Name>
-    <Summary xml:lang="en">Command line option parsing library</Summary>
-    <Summary xml:lang="tr">Komut satırı seçenekleri işleme kütüphanesi</Summary>
-    <RuntimeDependencies>
-      <Dependency>gettext</Dependency>
-    </RuntimeDependencies>
-    <Description>library files for popt</Description>
-    <Files>
-      <Path fileType="sharedLib">/usr/lib</Path>
-      <Path fileType="doc">/usr/share/doc</Path>
-      <Path fileType="doc">/usr/share/man</Path>
-      <Path fileType="localedata">/usr/share/locale</Path>
-      <Path fileType="header">/usr/include/popt.h</Path>
-    </Files>
-    <AdditionalFiles>
-      <AdditionalFile owner="root" permission="0755" target="/etc/init.d/acpid">acpid.rc6</AdditionalFile>
-    </AdditionalFiles>
-  </Package>
-  
-  <History>
-    <Update release="3">
-      <Date>06/14/2005</Date>
-      <Version>1.7</Version>
-    </Update>
-    <Update release="2">
-      <Date>06/10/2005</Date>
-      <Version>1.7</Version>
-    </Update>
-    <Update release="1">
-      <Date>05/05/2005</Date>
-      <Version>1.7</Version>
-      <Release>1</Release>
-    </Update>
-  </History>
+    <History>
+        <Update release="1">
+            <Date>2005-06-14</Date>
+            <Version>1.7</Version>
+            <Comment>First release.</Comment>
+            <Name>Kırmızı kafalar</Name>
+            <Email>hotmail@redhat.com</Email>
+        </Update>
+    </History>
 </PISI>