diff --git a/client/Makefile.am b/client/Makefile.am
index c44046050..c2f8fd383 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,5 +1,6 @@
 bin_PROGRAMS = icecc
-pkglibexec_SCRIPTS = icecc-create-env
+bin_SCRIPTS = icecc-create-env
+
 icecc_SOURCES = \
 	main.cpp \
 	arg.cpp \
@@ -27,6 +28,9 @@ install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/icerun
 	$(LN_S) $(bindir)/icecc $(DESTDIR)$(bindir)/icerun
+	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+	rm -f $(DESTDIR)$(pkglibexecdir)/icecc-create-env
+	$(LN_S) $(bindir)/icecc-create-env $(DESTDIR)$(pkglibexecdir)/icecc-create-env
 
 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)/bin
 	for link in g++ gcc c++ cc $(CLANG_SYMLINK_WRAPPERS); do \
@@ -36,6 +40,7 @@ install-exec-local:
 
 uninstall-local:
 	rm $(DESTDIR)$(bindir)/icerun
+	rm $(DESTDIR)$(pkglibexecdir)/icecc-create-env
 
 	for link in g++ gcc c++ cc $(CLANG_SYMLINK_WRAPPERS); do \
 		rm $(DESTDIR)$(pkglibexecdir)/bin/$$link ;\
diff --git a/doc/man-icecc-create-env.1.xml b/doc/man-icecc-create-env.1.xml
index cdad109f7..abd63d270 100644
--- a/doc/man-icecc-create-env.1.xml
+++ b/doc/man-icecc-create-env.1.xml
@@ -46,8 +46,7 @@
 
 <refsect1>
 <title>Description</title>
-<para>&icecc-create-env; (<filename>/usr/lib/icecc/icecc-create-env</filename>)
-is an Icecream helper that creates a new <literal role="extension">.tar.gz</literal>
+<para>&icecc-create-env; is an Icecream helper that creates a new <literal role="extension">.tar.gz</literal>
 archive with all the files (compiler, tools and libraries) needed to setup a
 build environment.</para>
 <para>Specifying <option>--gcc</option> or <option>--clang</option> as first