diff --git a/slib.spec b/slib.spec
index 9899b00..9fe1cf7 100644
--- a/slib.spec
+++ b/slib.spec
@@ -1,22 +1,21 @@
 Name:          slib
-Version:       3b5
+Version:       3b6
 Release:       1mamba
 Summary:       platform independent library for scheme
 Group:         Development/Tools
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://people.csail.mit.edu/jaffer/SLIB.html
+URL:           https://people.csail.mit.edu/jaffer/SLIB.html
 Source:        http://groups.csail.mit.edu/mac/ftpdir/scm/slib-%{version}.zip
 Patch0:        slib-3b4-texinfo-5.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: umb-scheme
 ## AUTOBUILDREQ-END
 Requires(post): umb-scheme
 Requires(post): %{__install_info}
-Requires(post): libguile1
+Requires(post): libguile-tools
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 "SLIB" is a portable library for the programming language Scheme.
@@ -30,44 +29,35 @@ Its catalog can be transparently extended to accomodate packages specific to a s
 
 touch collectx.scm
 
+# Path fix
+sed -r -i 's,/usr/(local/)?lib/slib,/usr/share/slib,g' *.init
+
+# Add missing headers and definitions
+sed -i "1s,^,#!/bin/sh\nexport SCHEME_LIBRARY_PATH=/usr/share/slib/\nVERSION=$pkgver\n,;s,\${S48_VICINITY},/usr/share/scheme48/,g" slib.sh
+
 #sed -i "s|/usr/lib/slib|%{_datadir}/slib|" *
 #sed -i "s|/usr/lib/umb-scheme|%{_datadir}/umb-scheme|" *
 
 %build
+:<< __OLD
 ./configure \
    --prefix=%{_prefix} \
    --libdir=%{_datadir} \
    --mandir=%{_mandir}
 
-%make
+#% make
 #gzip -9nf slib.info
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall INSTALL_INFO=/sbin/install-info
+#% makeinstall
 
-# Guile specific
-mkdir -p %{buildroot}%{_datadir}/guile/site
-ln -s %{_datadir}/slib %{buildroot}%{_datadir}/guile/site/slib
-
-#mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/slib
-#mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-#cp *.scm *.init *.xyz *.txt grapheps.ps Makefile ${RPM_BUILD_ROOT}%{_datadir}/slib
-#mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-#install -m644 slib.info.gz ${RPM_BUILD_ROOT}%{_infodir}
-#make    prefix=${RPM_BUILD_ROOT}%{_prefix}/ \
-#        man1dir=${RPM_BUILD_ROOT}%{_mandir}/man1/ \
-#        infodir=${RPM_BUILD_ROOT}%{_infodir}/ \
-#        pinstall
-
-#echo '#! /bin/sh'                        > ${RPM_BUILD_ROOT}%{_bindir}/slib
-#echo SCHEME_LIBRARY_PATH=%{_datadir}/slib/ >> ${RPM_BUILD_ROOT}%{_bindir}/slib
-#echo export SCHEME_LIBRARY_PATH         >> ${RPM_BUILD_ROOT}%{_bindir}/slib
-#echo VERSION=%{version}                 >> ${RPM_BUILD_ROOT}%{_bindir}/slib
-#echo "S48_VICINITY=\"%{_datadir}/scheme48\";export S48_VICINITY" >> ${RPM_BUILD_ROOT}%{_bindir}/slib
-#cat slib.sh                             >> ${RPM_BUILD_ROOT}%{_bindir}/slib
-#chmod +x ${RPM_BUILD_ROOT}%{_bindir}/slib
-#echo "srcdir = %{_datadir}/slib/" > %{buildroot}%{_datadir}/slib/srcdir.mk
+install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{guile/site,slib}
+install -m644 *.scm *.init *.xyz *.txt *.dat *.ps %{buildroot}%{_datadir}/slib/
+install -Dm755 slib.sh %{buildroot}%{_bindir}/slib
+ln -s %{_datadir}/slib %{buildroot}%{_datadir}/guile/site/
+install -Dm644 slib.info %{buildroot}%{_infodir}/slib.info
+install -Dm644 slib.1 %{buildroot}%{_mandir}/man1/slib.1
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -78,8 +68,8 @@ if [ $1 -ge 1 ]; then
    # FIXME: make catalogs has errors; making it silent
    %install_info %{name}.info
    # creates /usr/share/guile/site/2.0/slibcat
-   mkdir -p %{_datadir}/guile/1.8
-   guile1 -c "(use-modules (ice-9 slib)) (require 'new-catalog)" &>/dev/null || true
+   #mkdir -p %{_datadir}/guile/1.8
+   guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)" &>/dev/null || true
 fi
 exit 0
 
@@ -93,12 +83,15 @@ exit 0
 %dir %{_datadir}/slib
 %{_datadir}/slib/*
 %{_datadir}/guile/site/slib
-%{_infodir}/slib.info.gz
-%{_mandir}/man1/slib.1.gz
+%{_infodir}/slib.info*
+%{_mandir}/man1/slib.1*
 %doc COPYING
 #%doc ANNOUNCE README FAQ ChangeLog
 
 %changelog
+* Sat Jan 30 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3b6-1mamba
+- update to 3b6
+
 * Fri Jan 30 2015 Automatic Build System <autodist@mambasoft.it> 3b5-1mamba
 - automatic update by autodist