diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d17cdc8..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-clisp-2.46.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..46d25c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+clisp-2.47.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6519ece..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: clisp
-# $Id$
-NAME := clisp
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/clisp.spec b/clisp.spec
index 9e5568f..00542ef 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.46
-Release: 	3%{?dist}
+Version:	2.47
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPLv2
@@ -11,7 +11,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	imake
 BuildRequires:	libsigsegv-devel
 BuildRequires:	readline-devel
+BuildRequires:  dbus-devel
 BuildRequires:  diffutils
+BuildRequires:  fcgi-devel
 BuildRequires:  ffcall
 BuildRequires:  gdbm-devel
 BuildRequires:  gettext
@@ -68,6 +70,8 @@ Files necessary for linking CLISP.
 
 %prep
 %setup -q
+sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/HyperSpec/|g' \
+    doc/* src/*.d src/*.lisp
 
 
 %build
@@ -83,29 +87,34 @@ ulimit -s unlimited
             --mandir=%{_mandir} \
             --docdir=%{_docdir}/clisp-%{version} \
             --fsstnd=redhat \
+            --hyperspec=http://www.lispworks.com/documentation/HyperSpec/ \
             --with-module=bindings/glibc \
             --with-module=clx/new-clx \
+            --with-module=dbus \
+            --with-module=fastcgi \
             --with-module=gdbm \
             --with-module=gtk2 \
+            --with-module=i18n \
             --with-module=pcre \
             --with-module=postgresql \
             --with-module=rawsock \
+            --with-module=regexp \
+            --with-module=syscalls \
             --with-module=wildcard \
             --with-module=zlib \
             --with-readline \
+            --cbc \
             build CFLAGS=%opt_flags
 
-%ifarch ppc ppc64
-ulimit -s unlimited
-%endif
-make -C build
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make -C build DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps}
 cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
+cp -p doc/*.png $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
+cp -p doc/Why-CLISP* $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
+cp -p doc/regexp.html $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
+find $RPM_BUILD_ROOT%{_libdir} -name '*.dvi' | xargs rm -f
 %find_lang %{name}
 %find_lang %{name}low
 cat %{name}low.lang >> %{name}.lang
@@ -134,12 +143,10 @@ cat %{name}low.lang >> %{name}.lang
 %{_libdir}/clisp-*/base/*.a
 %{_libdir}/clisp-*/base/*.o
 %{_libdir}/clisp-*/base/*.h
-%{_libdir}/clisp-*/base/*.dvi
 %{_libdir}/clisp-*/base/makevars
 %{_libdir}/clisp-*/full/*.a
 %{_libdir}/clisp-*/full/*.o
 %{_libdir}/clisp-*/full/*.h
-%{_libdir}/clisp-*/full/*.dvi
 %{_libdir}/clisp-*/full/makevars
 %{_libdir}/clisp-*/linkkit
 
@@ -149,6 +156,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 22 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.47-1
+- new release 2.47
+
 * Wed Jul  2 2008 Gerard Milmeister <gemi@bluewin.ch> - 2.46-1
 - new release 2.46
 
diff --git a/sources b/sources
index c93978e..6e50c17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c4d8ed0f40e01999c4d799328a86c39  clisp-2.46.tar.bz2
+8fa89bb13e865fc7c7150b82682f35af  clisp-2.47.tar.bz2