diff --git a/Changes b/Changes
index 820f6d4..15b9f88 100644
--- a/Changes
+++ b/Changes
@@ -38,7 +38,9 @@ Improved documentation.
 
 Added stop and go to the uml_mconsole interface for the UML Box.
 
-Made perl 5.8 compliant perl-IO-Stty and perl-IO-tty rpm packages.
+Made perl 5.8 compliant perl-IO-Stty, perl-IO-tty and perl-Expect rpm
+packages.  Many things have changed especially with IO-tty and
+perl-Expect.
 
 
 1.4.0 - 01/06/2003
diff --git a/pkg/rpm/perl-Expect.spec b/pkg/rpm/perl-Expect.spec
index e2d78f2..bd90219 100644
--- a/pkg/rpm/perl-Expect.spec
+++ b/pkg/rpm/perl-Expect.spec
@@ -1,8 +1,8 @@
-# A SPEC to crreate a rpm package from Expect.  This should work on all
-# distributions using >= perl5.
+# A SPEC to create a rpm package from Expect.  This should work on all
+# distributions using perl5.8.
 
 # Update this according to version
-%define version 1.12
+%define version 1.15
 %define release 1
 
 
@@ -39,6 +39,8 @@ It is now possible to interconnect multiple file handles (and processes) much
 like Tcl's expect. An attempt was made to enable all the features of Tcl's
 expect without forcing Tcl on the victim programmer :-) .
 
+Compiled for perl 5.8.
+
 
 %prep
 %setup -n Expect-%{version}
@@ -53,11 +55,13 @@ make
 %install
 make install
 install -d /usr/share/doc/perl-Expect/examples/kibitz
+install -d /usr/share/man/man3
+cp -fa blib/man3/Expect.3pm /usr/share/man/man3
 cp -fa README /usr/share/doc/perl-Expect/README
 gzip -9c Changes > /usr/share/doc/perl-Expect/changelog.gz
 cp Expect.pod /usr/share/doc/perl-Expect/Expect.pod
 cp -fa tutorial/* /usr/share/doc/perl-Expect/examples
-cp -fa examples/kibitz/* /usr/share/doc/perl-Expect
+cp -fa examples/kibitz/* /usr/share/doc/perl-Expect/examples/kibitz
 
 # nothing to clean
 %clean
diff --git a/pkg/rpm/perl-IO-Stty.spec b/pkg/rpm/perl-IO-Stty.spec
index 743e6b3..67fdb1b 100644
--- a/pkg/rpm/perl-IO-Stty.spec
+++ b/pkg/rpm/perl-IO-Stty.spec
@@ -1,5 +1,5 @@
 # A SPEC to crreate a rpm package from IO-Stty-.  This should work on all
-# distributions using >= perl5.
+# distributions using perl5.8.
 
 # Update this according to version
 %define version .02
@@ -26,7 +26,7 @@ AutoReqProv: no
 
 %description
 This is a generic interface to handle secure pseudo terminals by perl
-scripts, such as the expect library. 
+scripts, such as the expect library.  Compiled for Perl 5.8. 
 
 
 
diff --git a/pkg/rpm/perl-IO-Tty.spec b/pkg/rpm/perl-IO-Tty.spec
index 5b458eb..40d7a4e 100644
--- a/pkg/rpm/perl-IO-Tty.spec
+++ b/pkg/rpm/perl-IO-Tty.spec
@@ -1,8 +1,8 @@
-# A SPEC to crreate a rpm package from IO-Tty.  This should work on all
-# distributions using >= perl5.
+# A SPEC to create a rpm package from IO-Tty.  This should work on all
+# distributions using perl5.8.
 
 # Update this according to version
-%define version 0.04
+%define version 1.02
 %define release 1
 
 
@@ -12,7 +12,7 @@ Version:      %{version}
 Release:      %{release}
 Copyright:    GPL
 Group:        Development/Perl
-Source:        http://www.perl.com/CPAN/authors/id/G/GB/GBARR/IO-Tty-%{version}.tar.gz
+Source:       http://www.perl.com/CPAN/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz
 URL:          http://gbootroot.sourceforge.net
 Distribution: BootRoot
 Vendor:       Free Software
@@ -26,7 +26,7 @@ AutoReqProv: no
 
 %description
 IO::Pty provides I/O handles to the master- and slave-side of a
-pseudo tty.
+pseudo tty.  Compiled for Perl 5.8.
 
 
 %prep
@@ -41,17 +41,23 @@ make
 # This here is a kludge to avoid versioning to allow the creation of a 
 # universal package.  This is done in Debian.
 %install
+
+install -d /usr/lib/perl5/site_perl/IO/Tty
 install -d /usr/lib/perl5/site_perl/auto/IO/Tty
+
 cp -fa blib/arch/auto/IO/Tty/Tty.so /usr/lib/perl5/site_perl/auto/IO/Tty/Tty.so
 cp -fa blib/arch/auto/IO/Tty/Tty.bs /usr/lib/perl5/site_perl/auto/IO/Tty/Tty.bs
-install -d /usr/lib/perl5/site_perl/auto/IO/Tty
 cp -fa Tty.pm /usr/lib/perl5/site_perl/IO/Tty.pm
 cp -fa Pty.pm /usr/lib/perl5/site_perl/IO/Pty.pm
+cp -fa Tty/Constant.pm /usr/lib/perl5/site_perl/IO/Tty/Constant.pm
+
 install -d /usr/share/man/man3
 cp -fa blib/man3/IO::Pty.3pm /usr/share/man/man3/IO::Pty.3pm
+cp -fa blib/man3/IO::Tty.3pm /usr/share/man/man3/IO::Tty.3pm
+cp -fa blib/man3/IO::Tty::Constant.3pm /usr/share/man/man3/IO::Tty::Constant.3pm
 install -d /usr/share/doc/perl-IO-Tty/examples
 cp -fa try /usr/share/doc/perl-IO-Tty/examples
-cp -fa COPYING /usr/share/doc/perl-IO-Tty
+cp -fa README /usr/share/doc/perl-IO-Tty/README
 gzip -9c ChangeLog > /usr/share/doc/perl-IO-Tty/changelog.gz
 
 # nothing to clean
@@ -59,15 +65,18 @@ gzip -9c ChangeLog > /usr/share/doc/perl-IO-Tty/changelog.gz
 
 
 %files
+%docdir /usr/share/doc/perl-IO-Tty/examples
+/usr/share/doc/perl-IO-Tty/examples/try
+/usr/share/doc/perl-IO-Tty/README
+/usr/share/doc/perl-IO-Tty/changelog.gz
 /usr/lib/perl5/site_perl/IO/Pty.pm
 /usr/lib/perl5/site_perl/IO/Tty.pm
+/usr/lib/perl5/site_perl/IO/Tty/Constant.pm
 %attr(0644, root,  root) /usr/lib/perl5/site_perl/auto/IO/Tty/Tty.bs
 %attr(0755, root, root) /usr/lib/perl5/site_perl/auto/IO/Tty/Tty.so
 /usr/share/man/man3/IO::Pty.3pm
-%docdir /usr/share/doc/perl-IO-Tty/examples
-/usr/share/doc/perl-IO-Tty/examples/try
-/usr/share/doc/perl-IO-Tty/COPYING
-/usr/share/doc/perl-IO-Tty/changelog.gz
+/usr/share/man/man3/IO::Tty.3pm
+/usr/share/man/man3/IO::Tty::Constant.3pm
 
 
 %changelog
diff --git a/yard/templates/Example.yard b/yard/templates/Example.yard
index 41273ec..d8e765f 100644
--- a/yard/templates/Example.yard
+++ b/yard/templates/Example.yard
@@ -1,4 +1,4 @@
-#  $Id: Example.yard,v 1.21 2003/02/08 06:29:57 freesource Exp $
+#  $Id: Example.yard,v 1.22 2003/02/10 17:38:34 freesource Exp $
 #  Example.yard
 #
 #  Creates a minimalistic multi-user runlevel root filesystem with
@@ -340,6 +340,7 @@ less
 dircolors
 grep         
 egrep
+msg
 tail       
 mknod		   	
 ps			   	
diff --git a/yard/templates/Helper.yard b/yard/templates/Helper.yard
index d02744d..0c589c9 100644
--- a/yard/templates/Helper.yard
+++ b/yard/templates/Helper.yard
@@ -1,4 +1,4 @@
-# $Id: Helper.yard,v 1.2 2002/12/12 01:10:23 freesource Exp $
+# $Id: Helper.yard,v 1.3 2003/02/07 18:29:26 freesource Exp $
 #  Helper.yard
 #
 #############################################################################
@@ -212,7 +212,9 @@ du
 rmdir
 less
 dircolors
-grep         
+grep
+egrep
+msg         
 tail       
 mknod		   	
 ##ps