diff -Nau bemusedlinuxserver1.71-orig/BemusedServerDlg.cpp bemusedlinuxserver1.71/BemusedServerDlg.cpp
--- bemusedlinuxserver1.71-orig/BemusedServerDlg.cpp	2003-09-11 07:09:22.000000000 +0300
+++ bemusedlinuxserver1.71/BemusedServerDlg.cpp	2004-02-06 11:41:59.000000000 +0200
@@ -48,7 +48,7 @@
 
 #include <xmmsctrl.h>
 
-#include <BemusedServerDlg.h>
+#include "BemusedServerDlg.h"
 
 using namespace std;
 
@@ -110,21 +110,22 @@
         return 0;
 }
 
+void sdpreg_cleanup(void)
+{
+	sdp_close(srvHandle);
+	sdp_cleanup();
+}
+
 int sdpreg_serialport(int port)
 {
         int	status = -1;
 
-        svcRec = sdp_create_rfcomm_svc(SDP_UUID_SERIAL_PORT, port);
+        svcRec = sdp_create_rfcomm_svc(SDP_UUID_SERIAL_PORT, 0x0000, 
+			SDP_UUID_SERIAL_PORT,"Bemused", "Coolstuff", "Music",port);
         if (svcRec == NULL) {
                 BTERROR("sdp_create_svc failed");
                 return -1;
         }
-        status = sdp_set_info_attr(svcRec, "Bemused", "Music", "Coolstuff");
-        if (status != 0) {
-                BTERROR("sdp_set_info_attr failed");
-                sdp_free_svc(svcRec);
-                return -1;
-        }
         status = sdp_register_service(srvHandle, svcRec);
         if (status != 0) {
                 BTERROR("sdp_register_service failed");
@@ -133,6 +134,19 @@
         }
         return 0;
 }
+int sdpreg_unregister()
+{
+	int		status;
+
+	if (!svcRec)
+		return 0;
+	status = sdp_delete_service(srvHandle, svcRec);
+	sdp_free_svc(svcRec);
+	svcRec = NULL;
+	
+	return 0;
+}
+
 #else
 
 bdaddr_t bdaddr;
diff -Nau bemusedlinuxserver1.71-orig/Makefile.affix bemusedlinuxserver1.71/Makefile.affix
--- bemusedlinuxserver1.71-orig/Makefile.affix	2003-08-19 13:27:59.000000000 +0300
+++ bemusedlinuxserver1.71/Makefile.affix	2004-02-09 13:26:38.000000000 +0200
@@ -1,15 +1,26 @@
+# Makefile for compiling Bemused for Affix
+# 2004, Andrei Emeltchenko
 
-SHELL = /bin/sh
-LIB = -lxmms -laffix -laffix_sdp -laffix_sdpsvc
+LIBS = -lxmms -laffix -laffix_sdp -laffix_sdpsvc -L/usr/local/lib
 INCL = -I/usr/include/xmms -I./
+CXXFLAGS = $(INCL) -DAFFIX `gtk-config --cflags`
+LDFLAGS = $(LIBS)
 
-bemusedlinuxserver: 	main.cpp BemusedServerDlg.cpp
-			$(CXX) -o bemusedlinuxserver $(INCL) $(LIB) `gtk-config --libs --cflags` -DAFFIX main.cpp BemusedServerDlg.cpp
-			
+BIN = $(DESTDIR)/usr/bin
 
-install:		bemusedlinuxserver
-			cp -u ./bemusedlinuxserver /usr/bin/bemusedlinuxserver
-			cp -i --reply=no ./bemused.conf /etc/bemused.conf
+OBJS = main.o BemusedServerDlg.o 
 
+bemusedlinuxserver: $(OBJS)
+	$(CXX) $(LDFLAGS) $(OBJS) -o bemusedlinuxserver
 
-				 
+install: bemusedlinuxserver
+	install -d $(BIN) $(DESTDIR)/etc
+	install -m755 ./bemusedlinuxserver $(BIN)
+	install -m644 ./bemused.conf $(DESTDIR)/etc/
+
+uninstall:
+	rm -rf $(BIN)/bemusedlinuxserver
+	rm -rf $(DESTDIR)/etc/bemused.conf
+	
+clean:
+	rm -rf $(OBJS) bemusedlinuxserver
Common subdirectories: bemusedlinuxserver1.71-orig/docs and bemusedlinuxserver1.71/docs
diff -Nau bemusedlinuxserver1.71-orig/main.cpp bemusedlinuxserver1.71/main.cpp
--- bemusedlinuxserver1.71-orig/main.cpp	2003-09-11 07:13:34.000000000 +0300
+++ bemusedlinuxserver1.71/main.cpp	2004-02-06 11:38:11.000000000 +0200
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 
-#include <BemusedServerDlg.h>
+#include "BemusedServerDlg.h"
 
 #define VERSION_STRING "1.71"
 
diff -Nau bemusedlinuxserver1.71-orig/readme.affix bemusedlinuxserver1.71/readme.affix
--- bemusedlinuxserver1.71-orig/readme.affix	2003-08-25 19:35:15.000000000 +0300
+++ bemusedlinuxserver1.71/readme.affix	2004-02-19 11:52:45.000000000 +0200
@@ -1,5 +1,5 @@
 README file for Affix Bluetooth protocol stack support in bemusedlinuxserver.
-
+!!  This doc is obsolete, read docs subdir.
 
 1. COMPILING
 type
@@ -8,7 +8,7 @@
 
 2. INSTALLING
 Make root and install bemused server by:
-# make install
+# make -f Makefile.affix install
 It will install bemused server and config file.
 
 3. CONFIGURING