diff --git a/pkgdef.template.irix b/pkgdef.template.irix
index b8db6cd..007742a 100644
--- a/pkgdef.template.irix
+++ b/pkgdef.template.irix
@@ -4,22 +4,28 @@ name="$topdir"
 pkgver="$pkgver"
 
 [base]
-subsys=sw.base
+subsys=sw.eoe
 files(-,root,sys)
 $_bindir
 $_sharedir
-$_libdir/*.so.*
 $_docdir
 
+[lib]
+subsys=sw.lib
+files(-,root,sys)
+$_libdir/*.so.*
+
 [man]
-subsys=man.manpages
+subsys=man.man
 files(-,root,sys)
 $_mandir
 $_infodir
 
 [devel]
-subsys=sw.devel
+subsys=sw.dev
 files(-,root,sys)
 $_includedir
 $_libdir/*.so
 $_libdir/*.a
+$_libdir/*.la
+
diff --git a/subsys.conf b/subsys.conf
index 70c0d0e..a6862a0 100644
--- a/subsys.conf
+++ b/subsys.conf
@@ -1,4 +1,7 @@
-sw.base Base Software
-sw.devel Development files
-man.doc Documentation
-man.manpages Manpages
+sw.eoe execution only environment
+sw.lib shared libraries
+sw.dev development files
+man.doc other documentation
+man.man manpages, infopages
+opt.relnotes release notes
+opt.src source