diff --git a/src/gui.c b/src/gui.c
index f30952c..413e1a4 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -37,8 +37,7 @@
 static void gui_set_bg_color __ARGS((char_u *name));
 static win_T *xy2win __ARGS((int x, int y));
 
-#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) \
-	&& !defined(__APPLE__)
+#if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__)
 # define MAY_FORK
 static void gui_do_fork __ARGS((void));
 
@@ -784,11 +783,9 @@
 gui_exit(rc)
     int		rc;
 {
-#ifndef __BEOS__
     /* don't free the fonts, it leads to a BUS error
      * richard@whitequeen.com Jul 99 */
     free_highlight_fonts();
-#endif
     gui.in_use = FALSE;
     gui_mch_exit(rc);
 }
diff --git a/src/version.c b/src/version.c
index 078d875..70bcc99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    644,
+/**/
     643,
 /**/
     642,