diff --git a/groff/groff.patch b/groff/groff.patch
new file mode 100644
index 0000000000..4b046e087b
--- /dev/null
+++ b/groff/groff.patch
@@ -0,0 +1,46 @@
+
+Index: contrib/mom/Makefile.sub
+===================================================================
+RCS file: /var/cvs/groff/contrib/mom/Makefile.sub,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -r1.8 -r1.9
+24c24
+< groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'`
+---
+> groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
+29c29,31
+< GROFF=GROFF_BIN_PATH=$(groff_bin_path); \
+---
+> GROFF=GROFF_COMMAND_PREFIX=''; \
+>       export GROFF_COMMAND_PREFIX; \
+>       GROFF_BIN_PATH=$(groff_bin_path); \
+Index: doc/Makefile.in
+===================================================================
+RCS file: /var/cvs/groff/doc/Makefile.in,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -r1.3 -r1.4
+61c61
+< groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'`
+---
+> groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
+71c71,73
+< GROFF=GROFF_BIN_PATH=$(groff_bin_path); \
+---
+> GROFF=GROFF_COMMAND_PREFIX=''; \
+>       export GROFF_COMMAND_PREFIX; \
+>       GROFF_BIN_PATH=$(groff_bin_path); \
+Index: doc/Makefile.sub
+===================================================================
+RCS file: /var/cvs/groff/doc/Makefile.sub,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -r1.4 -r1.5
+36c36
+< groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'`
+---
+> groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's|  *|:|g'`
+41a42,43
+>   GROFF_COMMAND_PREFIX=''; \
+>   export GROFF_COMMAND_PREFIX; \
diff --git a/groff/groff.spec b/groff/groff.spec
index f1efec2177..f61908f102 100644
--- a/groff/groff.spec
+++ b/groff/groff.spec
@@ -32,11 +32,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Text
 License:      GPL
-Version:      1.17.2
-Release:      20020206
+Version:      1.18
+Release:      20020726
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+Patch0:       groff.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -52,15 +53,27 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
-    PATH="%{l_prefix}/bin:$PATH"; export PATH
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CXX="%{l_cxx}" \
     CXXFLAGS="%{l_cflags -O}" \
     ./configure \
         --prefix=%{l_prefix}
+    PATH="`pwd`/src/roff/troff:$PATH"
+    PATH="`pwd`/src/roff/groff:$PATH"
+    PATH="`pwd`/src/devices/grops:$PATH"
+    PATH="`pwd`/workaround:$PATH"
+    mkdir workaround
+    for tool in xpmtoppm pnmdepth pnmtopng pnmtops; do
+        ( echo "#!/bin/sh"
+          echo "echo \"use of (non-existing) tool \\\"$tool\\\" disabled by OpenPKG\""
+          echo "exit 0"
+        ) >workaround/$tool
+        chmod a+x workaround/$tool
+    done
     %{l_make} %{l_mflags} \
         datasubdir='$(dataprogramdir)'
 
@@ -73,6 +86,7 @@ AutoReqProv:  no
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/doc
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}