diff --git a/development/ChangeLog b/development/ChangeLog
index e26453ca5e..2e599a5292 100644
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-09  Claus Hentschel  <claus.hentschel@mbau.fh-hannover.de>
+
+	* Win32/lyxwin32.c: update to accept arguments
+
+	* Makefile: new file
+
 2002-07-01  Claus Hentschel  <claus.hentschel@mbau.fh-hannover.de>
 
 	* Win32/lyxwin32.c: update to what was in 1.1.6fix4
diff --git a/development/Win32/lyxwin32.c b/development/Win32/lyxwin32.c
index 060fddc579..117a5de3bb 100644
--- a/development/Win32/lyxwin32.c
+++ b/development/Win32/lyxwin32.c
@@ -9,22 +9,32 @@
  *                   -mwindows -e _mainCRTStartup
  *
  * Claus Hentschel, 2002-01-17
+ *
+ * ================================================================
+ * Enhanced to pass filename argument(s) to LyX. Now lyxwin32.exe
+ * can be used to associate all lyx-files with LyX ;-)
+ *
+ * Claus Hentschel, 2002-07-04
  */
 #include <stdio.h>            /* standard io library */
 #include <stdlib.h>           /* standard library */
 #include <unistd.h>           /* sleep , fork & exec */
 #include <string.h>           /* standard string library */
 #include <errno.h>
+#include <sys/cygwin.h>
 
+char *internal_path(char *p, char *pp);
+	
 int main ( int argc, char *argv[] )
 {
 	char cmd [32000] = "lyx " ;  /* user command */
-	char *nargs [5 ] = {  /* execute with login /bin/bash */
+	char *nargs [5] = {  /* execute with login /bin/bash */
 		"/bin/bash", "--login",
 		"-c" , cmd ,
 		NULL
 	} ;
 	int i = 1; /* just to count */
+	char posixpath[1024]; /* POSIX style pathname if filename is passed */
 
 	/* ensure bash reads my global env changes */
 	putenv ( "BASH_ENV=/etc/lyxprofile" ) ;
@@ -33,7 +43,10 @@ int main ( int argc, char *argv[] )
 	while ( i < argc )
 	{
 		strcat ( cmd , "\"" ) ; /* add quote before */
-		strcat ( cmd , argv [ i ] ) ; /* add the argument */
+		if (strcmp(internal_path(argv[i], posixpath), argv[i]) == 0)
+			strcat ( cmd , argv [ i ] ) ; /* add the argument */
+		else
+			strcat ( cmd , posixpath ) ; /* add the filename */
 		strcat ( cmd , "\" " ) ; /* add closing quote */
 		i ++ ;
 	}
@@ -47,3 +60,10 @@ int main ( int argc, char *argv[] )
 	perror ( "Execute failed") ;
 	return ( 0 ) ; /* exit with no error */
 }
+
+/* returns converted name just for an easier usage ;-)
+ */
+char *internal_path(char *p, char *pp) {
+	cygwin_conv_to_posix_path(p, pp);
+	return pp;
+}
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1db050b8e3..12cad0465c 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-18  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* xformsGImage.C (init_graphics): disable handling of ps files in
+	xforms loader
+
 2002-07-11  Herbert Voss  <voss@perce.de>
 
 	* FormGraphics.C (input): test also the height for %-value, when
diff --git a/src/frontends/xforms/xformsGImage.C b/src/frontends/xforms/xformsGImage.C
index 8901797719..2783cadd62 100644
--- a/src/frontends/xforms/xformsGImage.C
+++ b/src/frontends/xforms/xformsGImage.C
@@ -414,7 +414,10 @@ void init_graphics()
 
 #ifdef HAVE_FLIMAGE_ENABLE_PS
 	// xforms recognises PS but not EPS
-	flimage_enable_ps();
+	// It dies horribly with lots of older PostScript files.
+	// Easiest, therefore, to disable PS support and insist that a
+	// PS-type file is converted to a bitmap format.
+	// flimage_enable_ps();
 #endif
 
 	flimage_enable_sgi();
diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 464514cb28..4847be7dab 100644
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,6 +1,6 @@
 2002-06-17  Herbert Voss  <voss@lyx.org>
 
-	* GraphicsCachItem.C: (findTargetFormat) remove the speciell case
+	* GraphicsCachItem.C (findTargetFormat): remove the speciell case
 	for old ps-files (Garst). It's no handled via defining a converter
 	and disabling the ps-support of xforms.
 
diff --git a/status.12x b/status.12x
index 5a2f01c61d..81f47a392d 100644
--- a/status.12x
+++ b/status.12x
@@ -86,6 +86,8 @@ What's new
 
 - fix conversion of some eps files
 
+- disable direct handling of ps files by the xforms image loader
+
 - do not ignore zero-length vertical spacing with 'keep' flag
 
 - fix drawing problems for collapsed ERT insets