diff --git a/slang-2.1.0-makefile.patch b/slang-2.1.0-makefile.patch
deleted file mode 100644
index 2c640b9..0000000
--- a/slang-2.1.0-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- slang-2.1.0/modules/Makefile.in.makefile	2007-05-28 23:02:29.000000000 +0200
-+++ slang-2.1.0/modules/Makefile.in	2007-06-14 15:37:32.000000000 +0200
-@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
- MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
- INSTALL		= @INSTALL@
- INSTALL_DATA	= @INSTALL_DATA@
--INSTALL_MODULE	= @INSTALL_MODULE@
-+INSTALL_MODULE	= @INSTALL@
- MKINSDIR	= ../autoconf/mkinsdir.sh
- SLSH_DIR	= $(prefix)/share/slsh
- CMAPS_DIR	= $(SLSH_DIR)/cmaps
-@@ -67,7 +67,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
- DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
- DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
- #---------------------------------------------------------------------------
--RPATH = @RPATH@
-+RPATH =
- 
- LIBS = $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
- #LIBS = $(RPATH) $(DL_LIB) -lm
---- slang-2.1.0/slsh/Makefile.in.makefile	2007-05-28 23:02:29.000000000 +0200
-+++ slang-2.1.0/slsh/Makefile.in	2007-06-14 15:30:48.000000000 +0200
-@@ -14,7 +14,7 @@ SLANG_SRCINC	= -I@SRCDIR@
- SLANG_SRCLIB	= -L@OBJDIR@ -L@ELFDIR@
- #---------------------------------------------------------------------------
- OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
--RPATH		= @RPATH@
-+RPATH		= 
- #----------------------------------------------------------------------------
- INSTALL		= @INSTALL@
- INSTALL_DATA	= @INSTALL_DATA@
-@@ -61,7 +61,7 @@ DEST_SLSH_SCRIPT_DIR = $(DESTDIR)$(SLSH_
- #----------------------------------------------------------------------------
- @SET_MAKE@
- SHELL = /bin/sh
--INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
- DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
---- slang-2.1.0/src/Makefile.in.makefile	2007-05-28 23:02:29.000000000 +0200
-+++ slang-2.1.0/src/Makefile.in	2007-06-14 15:13:30.000000000 +0200
-@@ -184,10 +184,10 @@ install-elf: elf install-headers install
- 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
- 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
- 	@echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
--	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
-+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
- 	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
- 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
--	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
-+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
- 	@echo ""
- 	@echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
- 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) were also created.
---- slang-2.1.0/autoconf/Makefile.in.makefile	2007-05-28 23:02:29.000000000 +0200
-+++ slang-2.1.0/autoconf/Makefile.in	2007-06-15 11:26:44.000000000 +0200
-@@ -18,8 +18,7 @@ help:
- 	@echo "make check : Build the library and run the regression tests"
- static: Makefile
- 	cd src; $(MAKE) static
--	cd slsh; $(MAKE) all
--elf: Makefile
-+elf: Makefile static
- 	cd src; $(MAKE) elf
- 	cd slsh; $(MAKE) all
- 	cd modules; $(MAKE) all
diff --git a/slang-2.1.2-makefile.patch b/slang-2.1.2-makefile.patch
new file mode 100644
index 0000000..2f65523
--- /dev/null
+++ b/slang-2.1.2-makefile.patch
@@ -0,0 +1,111 @@
+diff -up slang-2.1.2/modules/Makefile.in.makefile slang-2.1.2/modules/Makefile.in
+--- slang-2.1.2/modules/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
++++ slang-2.1.2/modules/Makefile.in	2007-09-17 17:56:45.000000000 +0200
+@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
+ MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+-INSTALL_MODULE	= @INSTALL_MODULE@
++INSTALL_MODULE	= @INSTALL@
+ MKINSDIR	= ../autoconf/mkinsdir.sh
+ SLSH_DIR	= $(prefix)/share/slsh
+ CMAPS_DIR	= $(SLSH_DIR)/cmaps
+@@ -67,7 +67,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
+ DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
+ DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
+ #---------------------------------------------------------------------------
+-RPATH = @RPATH@
++RPATH =
+ 
+ LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
+ #LIBS = $(RPATH) $(DL_LIB) -lm
+diff -up slang-2.1.2/slsh/Makefile.in.makefile slang-2.1.2/slsh/Makefile.in
+--- slang-2.1.2/slsh/Makefile.in.makefile	2007-09-09 03:39:18.000000000 +0200
++++ slang-2.1.2/slsh/Makefile.in	2007-09-17 17:56:45.000000000 +0200
+@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I@SRCDIR@
+ SLANG_SRCLIB	= -L@ELFDIR@
+ #---------------------------------------------------------------------------
+ OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
+-RPATH		= @RPATH@
++RPATH		= 
+ #----------------------------------------------------------------------------
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+@@ -64,7 +64,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
+ #----------------------------------------------------------------------------
+ @SET_MAKE@
+ SHELL = /bin/sh
+-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
++INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+ DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
+  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
+  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' 
+diff -up slang-2.1.2/src/Makefile.in.makefile slang-2.1.2/src/Makefile.in
+--- slang-2.1.2/src/Makefile.in.makefile	2007-09-08 04:47:29.000000000 +0200
++++ slang-2.1.2/src/Makefile.in	2007-09-17 18:07:25.000000000 +0200
+@@ -137,17 +137,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
+ # Rules
+ #---------------------------------------------------------------------------
+ all: static elf
+-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
++static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
++elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
+ 
+-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
++$(OBJS): $(OBJDIR)/stamp
++
++$(ELFOBJS): $(ELFDIR)/stamp
++
++$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
+ 	-$(RM) $(OBJDIR_NORMAL_LIB)
+ 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
+ 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
+ 	@echo ""
+ 	@echo $(NORMAL_LIB) created in $(OBJDIR)
+ 
+-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
++$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+ 	-$(RM) $(ELFDIR_ELF_LIB)
+ 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
+ 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
+@@ -158,10 +162,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
+ 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
+ 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
+ 	@echo ""
+-$(OBJDIR) :
++$(OBJDIR)/stamp :
+ 	-$(MKDIR) $(OBJDIR)
+-$(ELFDIR) :
++	touch $(OBJDIR)/stamp
++$(ELFDIR)/stamp :
+ 	-$(MKDIR) $(ELFDIR)
++	touch $(ELFDIR)/stamp
+ $(CONFIG_H) : sysconf.h
+ 	-$(CP) sysconf.h $(CONFIG_H)
+ 
+@@ -192,9 +198,9 @@ install-elf-and-links:
+ 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
+ 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
+ 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
+-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
++	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+ 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
+-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
++	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
+ 	@echo ""
+ 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
+ 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.
+diff -up slang-2.1.2/autoconf/Makefile.in.makefile slang-2.1.2/autoconf/Makefile.in
+--- slang-2.1.2/autoconf/Makefile.in.makefile	2007-08-30 05:14:55.000000000 +0200
++++ slang-2.1.2/autoconf/Makefile.in	2007-09-17 17:56:45.000000000 +0200
+@@ -18,8 +18,7 @@ help:
+ 	@echo "make check : Build the library and run the regression tests"
+ static: Makefile
+ 	cd src; $(MAKE) static
+-	cd slsh; $(MAKE) all
+-elf: Makefile
++elf: Makefile static
+ 	cd src; $(MAKE) elf
+ 	cd slsh; $(MAKE) all
+ 	cd modules; $(MAKE) all
diff --git a/slang.spec b/slang.spec
index 9507c39..926d01a 100644
--- a/slang.spec
+++ b/slang.spec
@@ -1,11 +1,11 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.1/%{name}-%{version}.tar.bz2
-Patch1: slang-2.1.0-makefile.patch
+Patch1: slang-2.1.2-makefile.patch
 Patch2: slang-nointerlibc2.patch
 Patch3: slang-LANG.patch
 URL: http://www.jedsoft.org/slang/
@@ -68,8 +68,8 @@ make %{?_smp_mflags} install_doc_dir=%{_docdir}/%{name}-%{version}
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install-all INSTALL="install -p" \
-	DESTDIR=$RPM_BUILD_ROOT install_doc_dir=%{_docdir}/%{name}-%{version}
+make install-all INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/{slang,slsh}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -85,6 +85,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files slsh
 %defattr(-,root,root)
+%doc slsh/doc/html/slsh*.html
 %config(noreplace) %{_sysconfdir}/slsh.rc
 %{_bindir}/slsh
 %{_libdir}/slang
@@ -93,7 +94,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files devel
 %defattr(-,root,root)
-%doc doc/*/cslang*.txt
+%doc doc/*/cslang*.txt doc/*/cref.txt
 %{_libdir}/libslang*.so
 %{_includedir}/slang
 
@@ -102,6 +103,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Sep 17 2007 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.2-1
+- update to 2.1.2
+
 * Thu Aug 23 2007 Miroslav Lichvar <mlichvar@redhat.com> - 2.1.1-2
 - update license tag
 - buildrequire gawk