diff --git a/Makefile.am b/Makefile.am
index 6d7c3dcb1..9140f24f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,7 @@ SUBDIRS = src data po
 
 ACLOCAL_AMFLAGS = -I m4
 
-if BUILD_REMOTE_CONTROL
-OPTIONAL_BIN = scripts/gajim-remote
-else
-OPTIONAL_BIN =
-endif
-
-bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
-
+bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
 
 docfilesdir = $(docdir)
 docfiles_DATA = README \
diff --git a/README.html b/README.html
index b06d01061..3ddfa08d5 100644
--- a/README.html
+++ b/README.html
@@ -37,7 +37,7 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
 <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li>
 <li>python-dbus bindings</li>
 <li>python-sexy to have clickable URLs in chat windows</li>
 <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
@@ -55,7 +55,6 @@ the xml lib that *comes* with python and not pyxml or whatever.
 <li>python-gtk2-dev</li>
 <li>libgtk2.0-dev aka. gtk2-devel</li>
 <li>libgtkspell-dev	(for the gtkspell module)</li>
-<li>libdbus-1-dev	(for the remote control module)</li>
 <li>intltool (>= 0.40.1)</li>
 </ul>
 
diff --git a/configure.ac b/configure.ac
index b4e09eeb0..b6b63c166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,27 +45,6 @@ AC_SUBST(PYGTK_LIBS)
 PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFS)
 
-dnl *****
-dnl dbus
-dnl *****
-AC_ARG_ENABLE([remote], 
-  [  --disable-remote        disable remote control via DBus [default auto]],
-  enable_remote=$enableval, enable_remote=auto)
-
-if test "x$enable_remote" = "xauto"; then
-	 PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no)
-fi
-
-if test "x$enable_remote" = "xyes";then
-	PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60])
-	AC_SUBST(DBUS_CFLAGS)
-	AC_SUBST(DBUS_LIBS)
-	have_remote=true
-else
-	have_remote=false
-fi
-AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
-
 AM_PATH_PYTHON([2.5])
 if test "x$PYTHON" = "x:"; then
 	AC_MSG_ERROR([Python not found])
@@ -184,7 +163,6 @@ AC_OUTPUT
 echo " 
 ***************************** 
   Build features:
-    remote control ... ${have_remote}
     trayicon ......... ${have_trayicon}
     idle module OSX .. ${have_idle_osx}
     cocoa (OSX)....... ${have_cocoa}