diff --git a/Makefile.am b/Makefile.am
index bf680095be05b44c82bdb14d1f816d3068546865..50329095c35dfa0e1a9ddd2b245d04cd76049838 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,13 @@ SUBDIRS = src data po
 
 ACLOCAL_AMFLAGS = -I m4
 
-bin_SCRIPTS = scripts/gajim
+if BUILD_REMOTE_CONTROL
+OPTIONAL_BIN = scripts/gajim-remote
+else
+OPTIONAL_BIN =
+endif
+
+bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
 
 
 docfilesdir = $(docdir)
@@ -19,13 +25,15 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in 	\
 	intltool-update.in	\
-	scripts/gajim.in
+	scripts/gajim.in	\
+	scripts/gajim-remote.in
 	
 DISTCLEANFILES = 		\
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update		\
-	scripts/gajim
+	scripts/gajim		\
+	scripts/gajim-remote
 
 MAINTAINERCLEANFILES = \
 	configure \
diff --git a/configure.ac b/configure.ac
index 79ccabff8f58dbe9dd385b2341540a47e8d46719..8cdde026db3f02bbcf72dc4f780320c718bec04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,7 @@ AC_CONFIG_FILES([
 	src/Makefile
 	src/common/Makefile
 	scripts/gajim
+	scripts/gajim-remote
 	po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/scripts/gajim-remote b/scripts/gajim-remote.in
old mode 100755
new mode 100644
similarity index 88%
rename from scripts/gajim-remote
rename to scripts/gajim-remote.in
index 4b2a762cb792f7c2cb47f2b4b40ed8d5e44d7098..f107fe42856486c3a2098c12e43de159f659433e
--- a/scripts/gajim-remote
+++ b/scripts/gajim-remote.in
@@ -28,6 +28,9 @@ if [ `id -u` -eq 0 ]; then
 	echo "You must not launch gajim-remote as root, it is INSECURE"
 fi
 
-cd PREFIX/share/gajim/src
-export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
-exec PYTHON_EXEC -OO gajim-remote.py "$@"
+datadir=@DATADIR@
+PYTHON_EXEC=@PYTHON@
+
+cd ${datadir}/gajim/src
+export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
+exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"