diff --git a/samples/logrotate/logrotate.pspec b/samples/logrotate/logrotate.pspec
index 89768fe5..7ee2e7f9 100644
--- a/samples/logrotate/logrotate.pspec
+++ b/samples/logrotate/logrotate.pspec
@@ -11,7 +11,8 @@
             <Email>PACKAGER_EMAIL</Email>
         </Packager>
         <License>GPL-2</License>
-        <IsA>ISA</IsA>
+        <IsA>system:util:logging</IsA>
+        <IsA>app:console</IsA>
         <PartOf>PARTOF</PartOf>
         <Description>Rotates, compresses, and mails system logs</Description>
         <Archive type="targz"
diff --git a/samples/popt/popt.pspec b/samples/popt/popt.pspec
index a7d22a29..27405bae 100644
--- a/samples/popt/popt.pspec
+++ b/samples/popt/popt.pspec
@@ -13,7 +13,7 @@
       <Email>hotmail@redhat.com</Email>
     </Packager>
     <License>As-Is</License>
-    <IsA>library:util</IsA>
+    <IsA>library:util:optparser</IsA>
     <PartOf>rpm:archive</PartOf>
     <Description>Command line option parsing library.
       While it is similiar to getopt(3), it contains a number of enhancements, including:
diff --git a/tools/portage2pisi.py b/tools/portage2pisi.py
index d1ee9807..aac19336 100644
--- a/tools/portage2pisi.py
+++ b/tools/portage2pisi.py
@@ -88,10 +88,10 @@ try:
             <Email>PACKAGER_EMAIL</Email>
         </Packager>
         <License>%s</License>
-        <IsA>ISA</IsA>
-        <PartOf>PARTOF</PartOf>
+        <IsA>category</IsA>
+        <PartOf>component</PartOf>
         <Description>%s</Description>
-        <Archive archType="%s" sha1sum="SUM">%s</Archive>
+        <Archive type="%s" sha1sum="SUM">%s</Archive>
         <BuildDependencies>
 
 %s