diff --git a/configure.in b/configure.in
index 8e7e08dfd..0e97afbad 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(create_vcs)
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.20
+VERSION=4.5.21
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
diff --git a/gnome/gdesktop.h b/gnome/gdesktop.h
index 1544c9939..a2bbaf023 100644
--- a/gnome/gdesktop.h
+++ b/gnome/gdesktop.h
@@ -44,6 +44,7 @@ typedef struct {
 	char *url;			/* URL this icon points to */
 	int selected : 1;		/* Is the icon selected? */
 	int tmp_selected : 1;		/* Temp storage for original selection while rubberbanding */
+	int requires_terminal : 1;      /* True if this requires a terminal to run */
 } DesktopIconInfo;
 
 void desktop_icon_info_open      (DesktopIconInfo *dii);
diff --git a/gnome/gpopup.c b/gnome/gpopup.c
index 7a7a6677c..e39a8c1bb 100644
--- a/gnome/gpopup.c
+++ b/gnome/gpopup.c
@@ -34,7 +34,8 @@ enum {
 	F_PANEL		= 1 << 6,       /* Applies to files from a panel window */
 	F_MOUNTABLE     = 1 << 7,       /* Only if the device is mountable */
 	F_UNMOUNTABLE   = 1 << 8,       /* Only if the device is unmountable */
-	F_EJECTABLE     = 1 << 9        /* Only if the device is ejectable */
+	F_EJECTABLE     = 1 << 9,       /* Only if the device is ejectable */
+	F_LOCAL         = 1 << 10       /* File must be on a local file system */
 };
 
 struct action {
@@ -260,9 +261,9 @@ static struct action file_actions[] = {
 	{ N_("Unmount device"),  F_SINGLE|F_UNMOUNTABLE|F_DICON, (GtkSignalFunc) dicon_unmount },
 	{ N_("Eject device"),    F_SINGLE|F_EJECTABLE|F_DICON,   (GtkSignalFunc) dicon_eject },
 	{ "",                    F_SINGLE,   	    	  	 NULL },
-	{ N_("Open"),            F_PANEL | F_ALL,      	  	 (GtkSignalFunc) panel_action_open },
-	{ N_("Open"),            F_DICON | F_ALL, 	  	 (GtkSignalFunc) dicon_execute },
-	{ N_("Open with"),       F_PANEL | F_ALL,      	  	 (GtkSignalFunc) panel_action_open_with },
+	{ N_("Open"),            F_LOCAL| F_PANEL | F_ALL,	 (GtkSignalFunc) panel_action_open },
+	{ N_("Open"),            F_LOCAL | F_DICON | F_ALL, 	 (GtkSignalFunc) dicon_execute },
+	{ N_("Open with"),       F_LOCAL | F_PANEL | F_ALL, 	 (GtkSignalFunc) panel_action_open_with },
 	{ N_("View"),            F_PANEL | F_NOTDIR,      	 (GtkSignalFunc) panel_action_view },
 	{ N_("View unfiltered"), F_PANEL | F_NOTDIR,      	 (GtkSignalFunc) panel_action_view_unfiltered },  
 	{ N_("Edit"),            F_PANEL | F_NOTDIR,             (GtkSignalFunc) panel_action_edit },
diff --git a/gnome/mc.keys.in.in b/gnome/mc.keys.in.in
index 929e5cc2c..e951281cf 100644
--- a/gnome/mc.keys.in.in
+++ b/gnome/mc.keys.in.in
@@ -225,6 +225,9 @@ video/x-ms-video:
 image/*:
 	icon-filename=@icondir@/gnome-image-generic.png
 
+image/x-psd:
+	icon-filename=@icondir@/gnome-image-psd.png
+
 text/*:
 	icon-filename=@icondir@/gnome-textfile.png
 	open=gnome-edit %f
\ No newline at end of file
diff --git a/new_icons/Makefile.in b/new_icons/Makefile.in
index f7df2198b..50c54b445 100644
--- a/new_icons/Makefile.in
+++ b/new_icons/Makefile.in
@@ -52,6 +52,7 @@ ALLICONS =						\
 	gnome-textfile.png				\
 	gnome-tex.png					\
 	gnome-audio.png					\
+	gnome-image-psd.png				\
 	gnome-image-xcf.png
 
 all:
diff --git a/new_icons/gnome-image-psd.png b/new_icons/gnome-image-psd.png
new file mode 100644
index 000000000..6e3a04b33
Binary files /dev/null and b/new_icons/gnome-image-psd.png differ
diff --git a/po/mc.pot b/po/mc.pot
index 1dbfe8995..dbc50813e 100644
--- a/po/mc.pot
+++ b/po/mc.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-02-25 00:35-0600\n"
+"POT-Creation-Date: 1999-02-25 00:53-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"