diff --git a/.gitignore b/.gitignore
index 60a4d5b..fd5fc7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,7 +109,6 @@ config.h.in
 config.sub
 configure
 daemon/gdm
-daemon/gdm-binary
 daemon/gdm-factory-slave
 daemon/gdm-session-worker
 daemon/gdm-simple-slave
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index dae7f13..6edde8b 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -296,10 +296,10 @@ gdm_session_worker_LDADD = 			\
 	$(NULL)
 
 sbin_PROGRAMS = 			\
-	gdm-binary			\
+	gdm				\
 	$(NULL)
 
-gdm_binary_SOURCES = 			\
+gdm_SOURCES = 			\
 	main.c				\
 	gdm-display-access-file.c	\
 	gdm-display-access-file.h	\
@@ -323,7 +323,7 @@ gdm_binary_SOURCES = 			\
 	gdm-dbus-util.h			\
 	$(NULL)
 
-nodist_gdm_binary_SOURCES = 			\
+nodist_gdm_SOURCES = 			\
 	gdm-display-glue.h			\
 	gdm-display-glue.c			\
 	gdm-local-display-factory-glue.h	\
@@ -357,26 +357,26 @@ XDMCP_nodist_SOURCES = 			\
 	$(NULL)
 
 if XDMCP_SUPPORT
-gdm_binary_SOURCES += $(XDMCP_SOURCES)
-nodist_gdm_binary_SOURCES += $(XDMCP_nodist_SOURCES)
+gdm_SOURCES += $(XDMCP_SOURCES)
+nodist_gdm_SOURCES += $(XDMCP_nodist_SOURCES)
 endif
 
-EXTRA_gdm_binary_SOURCES = 	\
+EXTRA_gdm_SOURCES = 	\
 	$(XDMCP_SOURCES)	\
 	$(NULL)
 
 CONSOLE_KIT_SOURCES = 		\
 	$(NULL)
 
-EXTRA_gdm_binary_SOURCES += $(CONSOLE_KIT_SOURCES)
+EXTRA_gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
 
 # Note that these libs are in LDFLAGS because they should come before
 # everything else on the link line as they may override stuff
-gdm_binary_LDFLAGS =				\
+gdm_LDFLAGS =				\
 	$(EXTRA_DAEMON_LIBS)			\
 	$(NULL)
 
-gdm_binary_LDADD = \
+gdm_LDADD = \
 	$(top_builddir)/common/libgdmcommon.la	\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
@@ -386,18 +386,10 @@ gdm_binary_LDADD = \
 	$(NULL)
 
 if WITH_CONSOLE_KIT
-gdm_binary_SOURCES += $(CONSOLE_KIT_SOURCES)
+gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
 endif
 
-sbin_SCRIPTS =		\
-	gdm		\
-	$(NULL)
-
-gdm: $(srcdir)/gdm.in
-	sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
-
 CLEANFILES =					\
-	gdm					\
 	gdm-display-glue.c			\
 	gdm-local-display-factory-glue.c	\
 	gdm-manager-glue.c			\
@@ -413,7 +405,6 @@ CLEANFILES =					\
 	$(NULL)
 
 EXTRA_DIST = 				\
-	gdm.in				\
 	gdm-manager.xml			\
 	gdm-session-worker.xml		\
 	gdm-session.xml			\
diff --git a/daemon/gdm.in b/daemon/gdm.in
deleted file mode 100644
index 16bad67..0000000
--- a/daemon/gdm.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# A script so that
-#    1) we read the standard system env vars
-#    2) syadmins/integrators can add their own private options etc...
-
-test -f /etc/profile && . /etc/profile
-
-# Make sure LANG is set
-#
-if [ -z "$LANG" ]
-then
-  if [ -f /etc/sysconfig/language ]
-  then
-    LANG=`. /etc/sysconfig/language; echo $RC_LANG`
-    export LANG
-  fi
-fi
-
-exec @sbindir@/gdm-binary "$@"
-
diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index ca6c6ee..2e44d04 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -2081,23 +2081,15 @@ Language=cs_CZ.UTF-8
       </para>
 
       <sect3 id="gdmcommandline">
-        <title><command>gdm</command> and <command>gdm-binary</command>
-               Command Line Options</title>
+        <title><command>gdm</command> Command Line Options</title>
 
         <para>
-          The <command>gdm</command> command is really just a script which
-          runs the <command>gdm-binary</command>, passing along any options.
-          Before launching <command>gdm-binary</command>, the gdm wrapper
-          script will source the <filename>&lt;etc&gt;/profile</filename> file
-          to set the standard system environment variables.  In order to better
-          support internationalization, it will also set the LC_MESSAGES
-          environment variable to LANG if neither LC_MESSAGES or LC_ALL are
-          set.  The <command>gdm-binary</command> is the actual GDM daemon.
-        </para>
+          <command>gdm</command> is the main daemon which sets up
+          graphical login environment and starts necesary helpers.
+       </para>
 
         <variablelist>
-          <title><command>gdm</command> and <command>gdm-binary</command>
-                 Command Line Options</title>
+          <title><command>gdm</command> Command Line Options</title>
 
           <varlistentry>
             <term>-?, --help</term>
