diff --git a/exim/exim.spec b/exim/exim.spec
index c8808aa710..4c7e715928 100644
--- a/exim/exim.spec
+++ b/exim/exim.spec
@@ -32,11 +32,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Mail
 License:      GPL
-Version:      3.35
-Release:      20020306
+Version:      4.05
+Release:      20020622
 
 #   list of sources
-Source0:      ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/exim-%{version}.tar.bz2
+Source0:      ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/exim-%{version}.tar.bz2
 Source1:      exim-man.tar.gz
 Source2:      rc.exim
 
@@ -64,12 +64,13 @@ Provides:     MTA
     %{l_gzip} -d -c %{SOURCE exim-man.tar.gz} | %{l_tar} xvf -
 
 %build
-    mkdir Local
     cp src/EDITME Local/Makefile
     ( echo "CC=%{l_cc}"
       echo "CFLAGS=%{l_cflags -O}"
       echo "EXIM_UID=%{l_muid}"
       echo "EXIM_GID=%{l_mgid}"
+      echo "EXIM_USER=%{l_nusr}"
+      echo "EXIM_GROUP=%{l_ngrp}"
       echo "LOG_FILE_PATH=%{l_prefix}/var/exim/log/%s.log"
       echo "PID_FILE_PATH=%{l_prefix}/var/exim/run/%s.pid"
       echo "SPOOL_DIRECTORY=%{l_prefix}/var/exim/spool"
@@ -84,6 +85,7 @@ Provides:     MTA
       echo "USE_DB=yes"
       echo "PERL_COMMAND=%{l_prefix}/bin/perl"
       echo "CHOWN_COMMAND=true"
+      echo "NO_SYMLINK=yes"
     ) >>Local/Makefile
     %{l_shtool} subst \
         -e 's;^\(BIN_DIRECTORY=\).*;\1%{l_prefix}/bin;' \
@@ -95,24 +97,18 @@ Provides:     MTA
     %{l_shtool} subst \
         -e 's;^\(CHOWN_COMMAND=\).*;\1true;' \
         OS/Makefile-`uname`
+
     make="%{l_make}"
     mflags="%{l_mflags}"
     case "%{l_target}" in
-        *-freebsd* ) make="/usr/bin/make"; mflags="" ;;
+        *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
     esac
     $make $mflags makefile
     $make $mflags
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} subst -s \
-        -e "s;^\\(BIN_DIRECTORY=*\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        -e "s;^\\(CONFIGURE_FILE=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        -e "s;^\\(SPOOL_DIRECTORY=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        -e "s;^\\(INFO_DIRECTORY=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        -e "s;^\\(LOG_FILE_PATH=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        -e "s;^\\(PID_FILE_PATH=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
-        Local/Makefile
+
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
@@ -121,28 +117,40 @@ Provides:     MTA
         $RPM_BUILD_ROOT%{l_prefix}/var/exim/run \
         $RPM_BUILD_ROOT%{l_prefix}/var/exim/log \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8
+
+    %{l_shtool} install -c -m 644 \
+        exim-man/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+
+    INST_CHOWN=true; export INST_CHOWN
+    INST_BIN_DIRECTORY=$RPM_BUILD_ROOT%{l_prefix}/bin; export INST_BIN_DIRECTORY
+    INST_CONFIGURE_FILE=$RPM_BUILD_ROOT%{l_prefix}/etc/exim/exim.conf; export INST_CONFIGURE_FILE
+    INST_INFO_DIRECTORY=$RPM_BUILD_ROOT%{l_prefix}/info; export INST_INFO_DIRECTORY
     make="%{l_make}"
     mflags="%{l_mflags}"
     case "%{l_target}" in
-        *-freebsd* ) make="/usr/bin/make"; mflags="" ;;
+        *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
     esac
-    INST_CHOWN=true; export INST_CHOWN
     $make $mflags install
-    %{l_shtool} install -c -m 644 \
-        exim-man/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+
+    mv $RPM_BUILD_ROOT%{l_prefix}/bin/exim-%{version}* \
+       $RPM_BUILD_ROOT%{l_prefix}/bin/exim
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
     ( cd $RPM_BUILD_ROOT%{l_prefix}/sbin
       ln -s ../bin/exim sendmail
       ln -s ../bin/exim mailq
       ln -s ../bin/exim rmail
     )
+
     ( echo "#!/bin/sh"
       echo "%{l_prefix}/sbin/sendmail -bi"
     ) >$RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
     chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/newaliases
+
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.exim} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
          %{l_files_std} \
          '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/exim'