diff --git a/data/Makefile.am b/data/Makefile.am
index 3e151e07..ff70c5cb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,5 @@
 include $(top_srcdir)/include.mk
 
-desktopdir = $(datadir)/applications
-desktop_in_in_files = gnome-shell-classic.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 sessiondir = $(datadir)/gnome-session/sessions
 session_in_in_files = gnome-classic.session.desktop.in.in
 session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
@@ -56,7 +51,6 @@ extension_list:=$(subst $(space),$(comma),$(extensions))
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
-	$(desktop_in_in_files) \
 	$(session_in_in_files) \
 	$(xsession_in_files) \
 	$(mode_in_files) \
@@ -65,7 +59,6 @@ EXTRA_DIST = \
 	$(NULL)
 
 CLEANFILES = \
-	$(desktop_DATA) \
 	$(session_DATA) \
 	$(xsession_DATA) \
 	$(mode_DATA) \
diff --git a/data/gnome-classic.session.desktop.in.in b/data/gnome-classic.session.desktop.in.in
index c52a82aa..e176fd3b 100644
--- a/data/gnome-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -1,3 +1,3 @@
 [GNOME Session]
 _Name=GNOME Classic
-RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
diff --git a/data/gnome-shell-classic.desktop.in.in b/data/gnome-shell-classic.desktop.in.in
deleted file mode 100644
index 76fdf216..00000000
--- a/data/gnome-shell-classic.desktop.in.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell Classic
-_Comment=Window management and application launching
-Exec=@bindir@/gnome-shell
-TryExec=@bindir@/gnome-shell
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=panel;windowmanager;
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false