diff -ruN imms-1.0/configure.ac imms-1.0.beep/configure.ac
--- imms-1.0/configure.ac	2004-01-25 16:55:21.000000000 -0500
+++ imms-1.0.beep/configure.ac	2004-02-14 03:45:42.565438352 -0500
@@ -48,17 +48,17 @@
     AC_DEFINE(LEGACY_RATINGS,, [Legacy ratings in ID3 tags support])
 fi
 
-AC_CHECK_PROG(have_xmms_config, xmms-config, "yes", "no")
-if test "$have_xmms_config" = "no"; then
-    AC_MSG_ERROR([xmms-config required and missing.])
+AC_CHECK_PROG(have_beep_config, beep-config, "yes", "no")
+if test "$have_beep_config" = "no"; then
+    AC_MSG_ERROR([beep-config required and missing.])
 else
-    CPPFLAGS=`xmms-config --cflags`
+    CPPFLAGS=`beep-config --cflags`
 fi
 
-AC_CHECK_HEADERS(xmms/plugin.h,, [with_xmms=no])
-AC_CHECK_HEADERS(xmms/xmmsctrl.h,, [with_xmms=no])
-if test "$with_xmms" = "no"; then
-    AC_MSG_ERROR([xmms required and missing.])
+AC_CHECK_HEADERS(bmp/plugin.h,, [with_beep=no])
+AC_CHECK_HEADERS(beep/beepctrl.h,, [with_beep=no])
+if test "$with_beep" = "no"; then
+    AC_MSG_ERROR([beep required and missing.])
 fi
 
 AC_CHECK_LIB(z, compress,, [with_zlib=no])
diff -ruN imms-1.0/interface.c imms-1.0.beep/interface.c
--- imms-1.0/interface.c	2004-01-25 16:55:21.000000000 -0500
+++ imms-1.0.beep/interface.c	2004-02-14 03:57:20.377354816 -0500
@@ -1,8 +1,8 @@
 #include <gtk/gtk.h>
 
-#include <xmms/configfile.h>
-#include <xmms/util.h>
-#include <xmms/plugin.h>
+#include <beep/configfile.h>
+#include <beep/util.h>
+#include <bmp/plugin.h>
 
 #include "immsconf.h"
 #include "plugin.h"
@@ -94,7 +94,7 @@
 
     read_config();
 
-    configure_win = gtk_window_new(GTK_WINDOW_DIALOG);
+    configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
             GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win);
     gtk_window_set_title(GTK_WINDOW(configure_win), "IMMS Configuration");
@@ -112,7 +112,7 @@
     gtk_container_add(GTK_CONTAINER(xidle_frame), xidle_vbox);
 
     xidle_desc = gtk_label_new(
-            "Disable this option if you use XMMS on a dedicated machine");
+            "Disable this option if you use Beep on a dedicated machine");
 
     gtk_label_set_line_wrap(GTK_LABEL(xidle_desc), TRUE);
     gtk_label_set_justify(GTK_LABEL(xidle_desc), GTK_JUSTIFY_LEFT);
@@ -134,7 +134,7 @@
     gtk_widget_show(xidle_hbox);
 
     /* Queue */
-    queue_frame = gtk_frame_new("XMMS Queue");
+    queue_frame = gtk_frame_new("Beep Queue");
     gtk_box_pack_start(GTK_BOX(configure_vbox), queue_frame, FALSE, FALSE, 0);
     queue_vbox = gtk_vbox_new(FALSE, 10);
     gtk_container_set_border_width(GTK_CONTAINER(queue_vbox), 5);
@@ -154,7 +154,7 @@
     gtk_box_pack_start(GTK_BOX(queue_vbox), queue_hbox, FALSE, FALSE, 0);
 
     queue_button = gtk_check_button_new_with_label(
-                "Honour XMMS Queue");
+                "Honour Beep Queue");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(queue_button), use_queue);
     gtk_box_pack_start(GTK_BOX(queue_hbox), queue_button, FALSE, FALSE, 0);
 
@@ -171,7 +171,7 @@
     gtk_container_add(GTK_CONTAINER(sloppy_frame), sloppy_vbox);
 
     sloppy_desc = gtk_label_new(
-            "Enable this if you use XMMS Crossfade plugin, "
+            "Enable this if you use Beep Crossfade plugin, "
             "or experience misdetected song skips.");
 
     gtk_label_set_line_wrap(GTK_LABEL(sloppy_desc), TRUE);
@@ -227,7 +227,7 @@
             "About IMMS",
             PACKAGE_STRING "\n\n"
             "Intelligent Multimedia Management System" "\n\n"
-            "IMMS is an intelligent playlist plug-in for XMMS" "\n"
+            "IMMS is an intelligent playlist plug-in for BMP" "\n"
             "that tracks your listening patterns" "\n"
             "and dynamically adapts to your taste." "\n\n"
             "It is incredibly unobtrusive and easy to use" "\n"
diff -ruN imms-1.0/plugin.cc imms-1.0.beep/plugin.cc
--- imms-1.0/plugin.cc	2004-01-25 16:55:21.000000000 -0500
+++ imms-1.0.beep/plugin.cc	2004-02-14 03:47:27.227527296 -0500
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <time.h>
 
-#include <xmms/plugin.h>
-#include <xmms/xmmsctrl.h> 
+#include <bmp/plugin.h>
+#include <beep/beepctrl.h>
 
 #include "immsconf.h"
 #include "plugin.h"
diff -ruN imms-1.0/rules.mk imms-1.0.beep/rules.mk
--- imms-1.0/rules.mk	2004-01-25 16:55:21.000000000 -0500
+++ imms-1.0.beep/rules.mk	2004-02-14 03:45:12.030080432 -0500
@@ -57,7 +57,7 @@
 	$(warning Use 'make install-user' to install for the current user only.)
 
 install-system: libimms.so
-	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`xmms-config --visualization-plugin-dir`
+	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`beep-config --visualization-plugin-dir`
 
 user-message:
 	$(warning Defaulting to installing for current user only.)
diff -ruN imms-1.0/vars.mk.in imms-1.0.beep/vars.mk.in
--- imms-1.0/vars.mk.in	2004-01-25 16:55:21.000000000 -0500
+++ imms-1.0.beep/vars.mk.in	2004-02-14 03:45:12.030080432 -0500
@@ -9,9 +9,9 @@
 CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \
 	   songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o
 
-CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
+CFLAGS = `beep-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
 CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti
-LDFLAGS = `xmms-config --libs` @LIBS@
+LDFLAGS = `beep-config --libs` -L/usr/X11R6/lib -lX11 @LIBS@
 ARFLAGS = rs
 
 default: all