diff --git a/.cvsignore b/.cvsignore
index 6a62515..7bf5cd9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-crm114-20060704a-BlameRobert.no-TRE.src.tar.gz
+crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2
diff --git a/crm114-64bit.patch b/crm114-64bit.patch
new file mode 100644
index 0000000..be6a819
--- /dev/null
+++ b/crm114-64bit.patch
@@ -0,0 +1,11 @@
+--- crm114-20070301-BlameBaltar.no-TRE.src/crm_str_funcs.c.64bit	2007-03-02 16:33:55.000000000 +0100
++++ crm114-20070301-BlameBaltar.no-TRE.src/crm_str_funcs.c	2007-04-17 19:03:50.000000000 +0200
+@@ -103,7 +103,7 @@
+ {
+   long i;
+   // unsigned long hval;
+-  long hval;
++  int32_t hval;
+   unsigned long tmp;
+ 
+   // initialize hval
diff --git a/crm114-rpm.patch b/crm114-rpm.patch
index 3e2d9ae..7e64ab5 100644
--- a/crm114-rpm.patch
+++ b/crm114-rpm.patch
@@ -1,17 +1,13 @@
---- crm114-20060704a-BlameRobert.src/megatest.sh.r	2006-07-08 04:48:12.000000000 +0200
-+++ crm114-20060704a-BlameRobert.src/megatest.sh	2006-08-16 22:56:23.000000000 +0200
-@@ -50,7 +50,7 @@
- crm skudtest.crm 
- crm statustest.crm 
- #./exectest.crm
--./unionintersecttest.crm 
-+crm unionintersecttest.crm 
- crm beeptest.crm 
- crm userdirtest.crm 
- crm windowtest.crm  <<-EOF
---- crm114-20060704a-BlameRobert.src/Makefile.r	2006-07-08 04:48:12.000000000 +0200
-+++ crm114-20060704a-BlameRobert.src/Makefile	2006-08-16 22:53:12.000000000 +0200
-@@ -47,7 +47,7 @@
+--- /dev/null	2007-04-15 01:47:43.733920889 +0200
++++ crm114-20070301-BlameBaltar.no-TRE.src/quine.crm	2007-04-15 21:45:04.000000000 +0200
+@@ -0,0 +1,4 @@
++{
++ window
++ output /:*:_pgm_text:/
++}
+--- crm114-20070301-BlameBaltar.no-TRE.src/Makefile.r	2007-03-02 16:33:55.000000000 +0100
++++ crm114-20070301-BlameBaltar.no-TRE.src/Makefile	2007-04-15 22:04:51.000000000 +0200
+@@ -52,7 +52,7 @@
  #  Tell the compiler full optimization, allow debugging, and warn on every
  #  possible error
  #  
@@ -20,16 +16,16 @@
  #     turn this one on for no optimization debugging.
  #CFLAGS += -O0 -g -Wall 
  #     turn this one on for really picayune debugging.
-@@ -56,7 +56,7 @@
- #   Choose between static and dynamic linking (we recommend static linking)
+@@ -62,7 +62,7 @@
  #   Comment this out if you want dynamic linking
  #
--LDFLAGS += -static
-+#LDFLAGS += -static
+ #    BSD users - do NOT use -static-libgcc!!!
+-LDFLAGS += -static -static-libgcc
++#LDFLAGS += -static -static-libgcc
  #
  #   Any standard install flags?  We nominally use protection 755
  INSTALLFLAGS += -m 755
-@@ -314,13 +314,13 @@
+@@ -360,13 +360,13 @@
  		crm_util_errorhandlers.o \
  		crm_osbf_maintenance.o -lm -ltre -o osbf-util
  
@@ -45,7 +41,7 @@
  	$(CC)  $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
  		crm_str_funcs.o \
  		crm_util_errorhandlers.o \
-@@ -354,29 +354,29 @@
+@@ -400,30 +400,30 @@
  
  install_utils:
  	$(MAKE) cssmerge cssutil cssdiff osbf-util
@@ -59,32 +55,33 @@
 +	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
  	#   if you don't have EMACS installed in the default place, you
  	#   won't get the crm114-mode.el automatically.
--	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
-+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+-	-install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
++	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
  
- install_tre: crm114_tre
--	install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
-+	install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
  
  # use different name so we can keep it around along with default one
  # and same VER_SUFFIX postfix 
+ install_engine: crm114
+-	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
++	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
+ 
  install_gnu: crm114_gnu
 -	install $(INSTALLFLAGS) crm114_gnu $(BINDIR)/crmg$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) crm114_gnu $(DESTDIR)$(BINDIR)/crmg$(VER_SUFFIX)
  
  install_binary_only: FORCE
--	install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
+-	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)	
 -	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
--	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
-+	install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
+-	-install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
++	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)	
 +	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
-+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
++	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
  
  uninstall: FORCE
  	-rm -rf $(BINDIR)/crm$(VER_SUFFIX)
diff --git a/crm114.spec b/crm114.spec
index d4bbd0a..5b6c794 100644
--- a/crm114.spec
+++ b/crm114.spec
@@ -1,6 +1,6 @@
-%define cvsver 20060704
-%define codename BlameRobert
-%define rel 2
+%define cvsver 20070301
+%define codename BlameBaltar
+%define rel 3
 
 Summary: CRM114 Bayesian Spam Detector
 Name: crm114
@@ -9,12 +9,11 @@ Release: 0.%{rel}.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
 License: GPL
 Group: Applications/Text
-Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}a-%{codename}.no-TRE.src.tar.gz
+Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.no-TRE.src.tar.bz2
 Patch0: %{name}-rpm.patch
+Patch1: %{name}-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: tre-devel
-# crashes: BZ#202893
-ExcludeArch: x86_64
 
 %description 
 CRM114 is a system to examine incoming e-mail, system log streams,
@@ -33,8 +32,9 @@ Requires: emacs-el
 Major Emacs mode for editing crm114 scripts.
 
 %prep
-%setup -q -n %{name}-%{cvsver}a-%{codename}.src
+%setup -q -n %{name}-%{cvsver}-%{codename}.no-TRE.src
 %patch0 -p1 -b .r
+%patch1 -p1 -b .64bit
 chmod 644 README *.cf *.h *.recipe *.txt
 
 %build
@@ -51,8 +51,6 @@ install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{nam
 install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %check
-export PATH=`pwd`:$PATH
-ln -s crm114_tre crm
 make megatest
 
 %files
@@ -66,6 +64,12 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Tue Apr 17 2007 Dominik Mierzejewski <rpm@greysector.net> 0-0.3.20070301
+- fix testsuite on 64bit, patch by Jaakko Hyvätti
+- updated to 20070301 "BlameBaltar"
+- added missing quine.crm to testsuite
+- no more crashes on x86_64, removed ExcludeArch, fixes #202893
+
 * Tue Aug 29 2006 Dominik Mierzejewski <rpm@greysector.net> 0-0.2.20060704
 - mass rebuild
 
diff --git a/sources b/sources
index d30281d..854f019 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fec214c03679398979387b22e96b1d9  crm114-20060704a-BlameRobert.no-TRE.src.tar.gz
+f9570a0e726914b9abc71da583213d99  crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2