diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 0cfae5f99..476169df1 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,13 @@
 1999-02-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
+	* Makefile.in (ICONS): Added i-fifo.png to the list of icons.
+
+	* gicon.c (gicon_init): Load the proper FIFO and socket icons.
+	(gnome_file_entry_color): Return the proper icon for FIFOs.
+
+	* i-fifo.png: Added this file, and made i-sock.png be the right
+	image (thanks, Tigert!).
+
 	* gscreen.c (ILIST_FROM_SW): New macro to extract the icon list
 	from the scrolled window.
 	(panel_create_icon_display): Create a scrolled window and put the
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index b48fe7e65..afb387799 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -93,6 +93,7 @@ ICONS = 			\
 	i-regular.png		\
 	i-core.png		\
 	i-sock.png		\
+	i-fifo.png		\
 	i-chardev.png		\
 	i-blockdev.png		\
 	i-stalled.png
diff --git a/gnome/gicon.c b/gnome/gicon.c
index 24585085d..14d3b3969 100644
--- a/gnome/gicon.c
+++ b/gnome/gicon.c
@@ -28,6 +28,7 @@ static GdkImlibImage *icon_view_symlink;
 static GdkImlibImage *icon_view_regular;
 static GdkImlibImage *icon_view_core;
 static GdkImlibImage *icon_view_sock;
+static GdkImlibImage *icon_view_fifo;
 static GdkImlibImage *icon_view_char_dev;
 static GdkImlibImage *icon_view_block_dev;
 static GdkImlibImage *icon_view_stalled;
@@ -66,6 +67,7 @@ gicon_init (void)
 	icon_view_regular    = gicon_stock_load	("i-regular.png");
 	icon_view_core       = gicon_stock_load	("i-core.png");
 	icon_view_sock       = gicon_stock_load	("i-sock.png");
+	icon_view_fifo       = gicon_stock_load ("i-fifo.png");
 	icon_view_char_dev   = gicon_stock_load	("i-chardev.png");
 	icon_view_block_dev  = gicon_stock_load	("i-blockdev.png");
 	icon_view_stalled    = gicon_stock_load ("i-stalled.png");
@@ -77,6 +79,7 @@ gicon_init (void)
 	    icon_view_regular    == NULL ||
 	    icon_view_core       == NULL ||
 	    icon_view_sock       == NULL ||
+	    icon_view_fifo       == NULL ||
 	    icon_view_char_dev   == NULL ||
 	    icon_view_block_dev  == NULL ||
 	    icon_view_stalled    == NULL){
@@ -155,7 +158,7 @@ gnome_file_entry_color (file_entry *fe)
 		return icon_view_block_dev;
 
 	if (S_ISFIFO (mode))
-		return icon_view_sock;
+		return icon_view_fifo;
 
 	if (is_exe (mode))
 		return icon_view_executable;
diff --git a/gnome/i-fifo.png b/gnome/i-fifo.png
new file mode 100644
index 000000000..eb6840616
Binary files /dev/null and b/gnome/i-fifo.png differ
diff --git a/gnome/i-sock.png b/gnome/i-sock.png
index eb6840616..088af9c57 100644
Binary files a/gnome/i-sock.png and b/gnome/i-sock.png differ