diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 73d340862e5e..7f71181bfc92 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 USE_X_PREFIX=	yes
 ALL_TARGET=
-MAN1=		xloadimage.1
+MAN1=		xloadimage.1 uufilter.1
 
 do-configure:
 	cd ${WRKSRC} && ${MAKE} configure </dev/null
@@ -26,5 +26,6 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} xloadimage uufilter ${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_DATA} xloadimagerc ${PREFIX}/lib/X11/app-defaults/Xloadimage
 	cd ${WRKSRC} && ${SED} -e s:/usr/lib/X11/Xloadimage:${PREFIX}/lib/X11/app-defaults/Xloadimage: < xloadimage.man >${PREFIX}/man/man1/xloadimage.1
+	${INSTALL_MAN} ${WRKSRC}/uufilter.man ${PREFIX}/man/man1/uufilter.1
 
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/files/patch-6 b/x11/xloadimage/files/patch-6
new file mode 100644
index 000000000000..b2cb0f1cc85e
--- /dev/null
+++ b/x11/xloadimage/files/patch-6
@@ -0,0 +1,11 @@
+--- Makefile	Tue Nov  9 17:25:12 1993
++++ Makefile	Sun Jul  2 10:56:48 2000
+@@ -24,5 +24,7 @@
+ 
+ autoconfig: autoconfig.c
+-	$(CC) -g -o autoconfig autoconfig.c
++	$(CC) -o autoconfig autoconfig.c -DDEF_CC='"${CC}"' \
++		-DDEF_OPT_FLAGS='"${OPT_FLAGS}"' \
++		-DDEF_INSTALL_DIR='"${PREFIX}/bin"'
+ 
+ # manual configuration target
diff --git a/x11/xloadimage/files/patch-7 b/x11/xloadimage/files/patch-7
new file mode 100644
index 000000000000..bca1abcecd88
--- /dev/null
+++ b/x11/xloadimage/files/patch-7
@@ -0,0 +1,12 @@
+--- Make.conf	Tue Nov  9 17:26:55 1993
++++ Make.conf	Sun Jul  2 10:57:03 2000
+@@ -12,5 +12,8 @@
+ 
+ # Optimization flags for C compiler.
+-OPT_FLAGS=
++# A comment inside autoconfig.c recommends the two extra options:
++#	-fstrength-reduce and -finline-functions
++# Unfortunately, strength-reduce triggers a bug in the gcc-2.95.2.
++OPT_FLAGS:=-fno-strength-reduce -finline-functions ${CFLAGS}
+ 
+ # Miscellaneous system libraries.