diff --git a/expect-warnings.patch b/expect-warnings.patch
index da7f043..bf66324 100644
--- a/expect-warnings.patch
+++ b/expect-warnings.patch
@@ -1551,8 +1551,8 @@ Index: expect.c
 -int cmdtype;
 +exp_cmd_init(
 +    struct exp_cmd_descriptor *cmd,
-+    int duration,
-+    int cmdtype)
++    int cmdtype,
++    int duration)
  {
  	cmd->duration = duration;
  	cmd->cmdtype = cmdtype;
diff --git a/expect.changes b/expect.changes
index aec0652..b344f29 100644
--- a/expect.changes
+++ b/expect.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  3 14:00:24 CEST 2008 - max@suse.de
+
+- Fixed swapped arguments in prototype of exp_cmd_init()
+- Adjusted installation to the new Tcl file system layout
+
 -------------------------------------------------------------------
 Thu Mar 20 19:13:00 CET 2008 - max@suse.de
 
diff --git a/expect.patch b/expect.patch
index 35cfd33..064b064 100644
--- a/expect.patch
+++ b/expect.patch
@@ -25,7 +25,7 @@ Index: Makefile.in
  pkgIndex.tcl-hand:
  	(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
 -	    [list load [file join $$dir $(PKG_LIB_FILE)]]'\
-+	    [list load $(PKG_LIB_FILE)]'\
++	    [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
  	) > pkgIndex.tcl
  
  #========================================================================
diff --git a/expect.spec b/expect.spec
index a007466..9d1985a 100644
--- a/expect.spec
+++ b/expect.spec
@@ -15,7 +15,7 @@ Url:            http://expect.nist.gov
 Name:           expect
 BuildRequires:  tcl-devel
 Version:        5.44.1.5
-Release:        1
+Release:        6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          Development/Languages/Tcl
 License:        Public Domain, Freeware
@@ -41,6 +41,7 @@ Authors:
     libes@nist.gov
 
 %package devel
+License:        Public Domain, Freeware
 Group:          Development/Libraries/Tcl
 Summary:        Header Files and C API Documentation for expect
 
@@ -73,23 +74,20 @@ CFLAGS="%optflags" \
 	--with-tcl=%_libdir \
 	--with-tk=no_tk \
 	--mandir=%_mandir \
+	--with-tclinclude=/usr/include \
 	--enable-shared
-make all
+make all pkglibdir=%_libdir/tcl/%name%version
 
 %check
 make test
 
 %install
 # set the right path to the expect binary...
-cd example
-for f in *; do
-	sed -e '1s,^#![^ ]*expectk,#!/usr/bin/wish\npackage require Expect,' \
-	    -e '1s,^#![^ ]*expect,#!/usr/bin/expect,' $f > $f.mod
-	mv $f.mod $f
-	chmod a+x $f
-done
-cd ..
-make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%tclscriptdir/%name%version install
+sed -i \
+    -e '1s,^#![^ ]*expectk,#!/usr/bin/wish\npackage require Expect,' \
+    -e '1s,^#![^ ]*expect,#!/usr/bin/expect,' \
+    example/*
+make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%_libdir/tcl/%name%version
 # Remove some executables and manpages we don't want to ship
 rm $RPM_BUILD_ROOT%_prefix/bin/*passwd
 rm $RPM_BUILD_ROOT%_mandir/*/*passwd*
@@ -99,18 +97,21 @@ rm -rf %buildroot
 
 %files
 %defattr(-,root,root)
-%{_prefix}/bin/*
-%{_libdir}/libexpect*
-%{_datadir}/tcl/expect*
-%doc %{_mandir}/man1/*
+%_prefix/bin/*
+%_libdir/tcl/*
+%_libdir/lib*so
+%doc %_mandir/man1/*
 %doc ChangeLog HISTORY INSTALL FAQ NEWS README
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*
-%doc %{_mandir}/man3/*
+%_includedir/*
+%doc %_mandir/man3/*
 
 %changelog
+* Thu Apr 03 2008 max@suse.de
+- Fixed swapped arguments in prototype of exp_cmd_init()
+- Adjusted installation to the new Tcl file system layout
 * Thu Mar 20 2008 max@suse.de
 - Update to version 5.44.1.5 from CVS:
   * Improved internal buffer management