diff --git a/emacs/emacs.patch b/emacs/emacs.patch
index b8ba3f66ca..562fc097b1 100644
--- a/emacs/emacs.patch
+++ b/emacs/emacs.patch
@@ -1,47 +1,51 @@
---- configure.orig	Mon Jan 13 17:26:11 2003
-+++ configure	Mon Jan 13 17:26:09 2003
-@@ -1527,8 +1527,18 @@
+--- configure.orig	Thu Jul 31 09:30:40 2003
++++ configure	Thu Jul 31 09:32:10 2003
+@@ -805,6 +805,16 @@
+ machine='' opsys='' unported=no
+ case "${canonical}" in
+ 
++  ## FreeBSD ports
++  *-*-freebsd* )
++    opsys=freebsd
++    case "${canonical}" in
++      alpha*-*-freebsd*)     machine=alpha ;;
++      i[3456]86-*-freebsd*)  machine=intel386 ;;
++      sparc64-*-freebsd*)    machine=sparc ;;
++    esac
++  ;;
++
+   ## NetBSD ports
+   *-*-netbsd* )
+     opsys=netbsd
+@@ -1535,9 +1545,19 @@
  		NON_GNU_CPP=/usr/ccs/lib/cpp
  		RANLIB="ar -ts"
  		;;
 -      *-sunos5* | *-solaris* )
 +      *-sunos5.6* | *-solaris2.6* )
-+		opsys=sol2-5
-+		NON_GNU_CPP=/usr/ccs/lib/cpp
-+		RANLIB="ar -ts"
-+		;;
-+      *-sunos5.7* | *-solaris2.7* )
  		opsys=sol2-5
-+		NON_GNU_CPP=/usr/ccs/lib/cpp
-+		RANLIB="ar -ts"
-+		;;
-+      *-sunos5* | *-solaris* )
-+		opsys=sol2-8
- 		NON_GNU_CPP=/usr/ccs/lib/cpp
- 		;;
-       *			  ) opsys=bsd4-2   ;;
---- configure.in.orig	Mon Jan 13 17:26:10 2003
-+++ configure.in	Mon Jan 13 17:26:10 2003
-@@ -901,8 +901,18 @@
  		NON_GNU_CPP=/usr/ccs/lib/cpp
- 		RANLIB="ar -ts"
- 		;;
--      *-sunos5* | *-solaris* )
-+      *-sunos5.6* | *-solaris2.6* )
-+		opsys=sol2-5
-+		NON_GNU_CPP=/usr/ccs/lib/cpp
 +		RANLIB="ar -ts"
 +		;;
 +      *-sunos5.7* | *-solaris2.7* )
- 		opsys=sol2-5
++		opsys=sol2-5
 +		NON_GNU_CPP=/usr/ccs/lib/cpp
 +		RANLIB="ar -ts"
 +		;;
 +      *-sunos5* | *-solaris* )
 +		opsys=sol2-8
- 		NON_GNU_CPP=/usr/ccs/lib/cpp
++		NON_GNU_CPP=/usr/ccs/lib/cpp
  		;;
        *			  ) opsys=bsd4-2   ;;
+     esac
+@@ -1658,7 +1678,6 @@
+ 				;;
+       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
+       *-386bsd* )	        opsys=386bsd ;;
+-      *-freebsd* )	        opsys=freebsd ;;
+       *-nextstep* )             opsys=nextstep ;;
+       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
+     esac
 --- /dev/null	Mon Jan 13 19:51:22 2003
 +++ src/s/sol2-8.h	Mon Jan 13 18:15:37 2003
 @@ -0,0 +1,10 @@
@@ -55,3 +59,66 @@
 +#undef bcopy
 +#undef bzero
 +
+--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
++++ src/Makefile.in	Mon Oct 21 13:37:26 2002
+@@ -155,6 +155,10 @@
+ /* This holds special options for linking temacs
+    that should be used for linking anything else.  */
+ #ifndef LD_SWITCH_SYSTEM_TEMACS
++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
++#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
++#else
+ #define LD_SWITCH_SYSTEM_TEMACS
++#endif
+ #endif
+ 
+--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
++++ src/alloc.c	Thu Sep 12 13:48:11 2002
+@@ -3723,7 +3723,11 @@
+   /* This trick flushes the register windows so that all the state of
+      the process is contained in the stack.  */
+ #ifdef sparc
++#ifdef __sparc64__
++  asm ("flushw");
++#else
+   asm ("ta 3");
++#endif
+ #endif
+   
+   /* Save registers that we need to see on the stack.  We need to see
+--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
++++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
+@@ -198,7 +198,7 @@
+ 
+ #ifndef NOT_C_CODE
+ /* We need these because pointers are larger than the default ints.  */
+-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ 
+--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
++++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
+@@ -89,7 +89,7 @@
+ #define PURESIZE 130000
+ #endif
+ 
+-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
++#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
+ /* This really belongs in s/sun.h.  */
+ 
+ /* Say that the text segment of a.out includes the header;
+--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
++++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
+@@ -68,6 +68,11 @@
+ #define LIBS_SYSTEM -lutil
+ #if __FreeBSD_version < 400000
+ #define LIBS_TERMCAP -ltermcap
++#else
++#ifdef HAVE_LIBNCURSES
++#define TERMINFO
++#define LIBS_TERMCAP -lncurses
++#endif
+ #endif
+ 
+ #define SYSV_SYSTEM_DIR
diff --git a/emacs/emacs.spec b/emacs/emacs.spec
index e2f1439e6c..a4f8c5c65f 100644
--- a/emacs/emacs.spec
+++ b/emacs/emacs.spec
@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Editor
 License:      GPL
 Version:      21.3
-Release:      20030729
+Release:      20030731
 
 #   package options
 %option       with_x11       no