diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-1.0/files/patch-set_soenv.1 b/editors/openoffice-1.0/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-1.0/files/patch-set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-1.1-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-2.0-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-3-devel/files/patch-set_soenv.1 b/editors/openoffice-3-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-3-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-3-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-3/files/patch-set_soenv.1 b/editors/openoffice-3/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-3/files/patch-set_soenv.1
+++ b/editors/openoffice-3/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice-devel/files/patch-set_soenv.1 b/editors/openoffice-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-1.0/files/patch-set_soenv.1 b/editors/openoffice.org-1.0/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-1.0/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.0/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-1.1/files/patch-set_soenv.1 b/editors/openoffice.org-1.1/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.1/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-2-RC/files/patch-set_soenv.1 b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-2-RC/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-2-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-2.0/files/patch-set_soenv.1 b/editors/openoffice.org-2.0/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-2.0/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2.0/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-2/files/patch-set_soenv.1 b/editors/openoffice.org-2/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-2/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-3-RC/files/patch-set_soenv.1 b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-3-RC/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-3-devel/files/patch-set_soenv.1 b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-3-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-3/files/patch-set_soenv.1 b/editors/openoffice.org-3/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-3/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
+++ b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice/files/patch-config_office+set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +
diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1
index bcf91ac5f6aa..96793dadbf6d 100644
--- a/editors/openoffice/files/patch-set_soenv.1
+++ b/editors/openoffice/files/patch-set_soenv.1
@@ -25,7 +25,7 @@
 +   $PATH             .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
 +
 +   $PATH             .= $ps.$USR.$ds."sbin".
-+                        $ps.$USR.$BIN.$ds."X11".
++                        $ps.$USR.$ds."X11R6".$ds."bin".
 +                        $ps.$USR.$LIB;
 +}
 +