diff --git a/configure.ac b/configure.ac
index 247492cdb..588dfc1b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,17 @@ PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)
 # it becomes stable.
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 
+META_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix metacity-plugins`/bin
+# FIXME: metacity-plugins.pc should point directly to its .gir file
+META_LIB_DIR=`$PKG_CONFIG --variable=libdir metacity-plugins`
+AC_SUBST(META_BIN_DIR)
+AC_SUBST(META_LIB_DIR)
+
+GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0`
+GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0`
+AC_SUBST(GJS_JS_DIR)
+AC_SUBST(GJS_JS_NATIVE_DIR)
+
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
 G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
@@ -63,4 +74,5 @@ AC_OUTPUT([
   Makefile
   data/Makefile
   src/Makefile
+  src/gnome-shell
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e558132d..618abc67e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefil
 	$(G_IR_SCANNER)		\
 		--namespace=Shell			\
 		--nsversion=0.1				\
-		--add-include-path=$(libdir)/metacity/  \
+		--add-include-path=$(META_LIB_DIR)/metacity/ \
 		--include=Clutter-0.9			\
 		--include=Meta-2.25			\
 		--add-include-path=$(builddir)     \
@@ -146,3 +146,6 @@ CLEANFILES += Big-1.0.gir
 Big-1.0.typelib: libbig-1.0.la Big-1.0.gir
 	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Big-1.0.gir -o $@
 CLEANFILES += Big-1.0.typelib
+
+all-local:
+	chmod a+x gnome-shell
diff --git a/src/gnome-shell b/src/gnome-shell.in
similarity index 97%
rename from src/gnome-shell
rename to src/gnome-shell.in
index b81c0ccd8..84c804ec0 100755
--- a/src/gnome-shell
+++ b/src/gnome-shell.in
@@ -116,10 +116,10 @@ def start_shell():
 
     # Set up environment
     env = dict(os.environ)
-    env.update({'GNOME_SHELL_JS'      : js_dir,
+    env.update({'GNOME_SHELL_JS'      : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + js_dir,
                 'GNOME_SHELL_DATADIR' : data_dir,
                 'GI_TYPELIB_PATH'     : plugin_dir,
-                'PATH'                : os.environ.get('PATH', '') + ':' + plugin_dir,
+                'PATH'                : '@META_BIN_DIR@:' + os.environ.get('PATH', '') + ':' + plugin_dir,
                 'LD_LIBRARY_PATH'     : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir,
                 'GNOME_DISABLE_CRASH_DIALOG' : '1'})