diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 00cd05e89c78..05b437e06b13 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	libpaper
-PORTVERSION=	1.1.14.3
-PORTREVISION=	1
+PORTVERSION=	1.1.21
+PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/libp/libpaper
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/.3/-3/}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	A library providing routines for paper size management
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_GETOPT_LONG=yes
-CONFIGURE_ARGS=	--build=${CONFIGURE_TARGET}
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--build=${CONFIGURE_TARGET} --mandir=${PREFIX}/man
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.3//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=	paperconf.1
 MAN3=	defaultpapername.3 defaultpapersizefile.3 paperdone.3 paperfirst.3 \
diff --git a/print/libpaper/distinfo b/print/libpaper/distinfo
index 013a1fef8a51..19350f208f1c 100644
--- a/print/libpaper/distinfo
+++ b/print/libpaper/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpaper_1.1.14-3.tar.gz) = ce8aa414571fb5afd278e2a6de0fac29
-SHA256 (libpaper_1.1.14-3.tar.gz) = dd6e3268904f7295483f8ab042c4f0971244cffb22108971fb1e348abfe38a32
-SIZE (libpaper_1.1.14-3.tar.gz) = 301674
+MD5 (libpaper_1.1.21.tar.gz) = 6397f8d60a157119c1de5d19e4d82436
+SHA256 (libpaper_1.1.21.tar.gz) = ce3b97f74c0ac4e0b3c8cb1bcbc6865e2068d63c9b493b7bf37b84dd5ebe702b
+SIZE (libpaper_1.1.21.tar.gz) = 350788
diff --git a/print/libpaper/files/patch-lib-Makefile.in b/print/libpaper/files/patch-lib-Makefile.in
new file mode 100644
index 000000000000..1eb9e0953d45
--- /dev/null
+++ b/print/libpaper/files/patch-lib-Makefile.in
@@ -0,0 +1,19 @@
+--- lib/Makefile.in.orig	Mon Apr  9 10:45:45 2007
++++ lib/Makefile.in	Mon Apr  9 10:49:48 2007
+@@ -500,14 +500,14 @@
+ 
+ 
+ paperspecs.h: paperspecs Makefile
+-	echo '    /* This file has been automaticaly generated.' >$@
++	echo '    /* This file has been automatically generated.' >$@
+ 	echo '       Edit paperspecs to make changes to the papers specifications. */' >>$@
+ 	echo >>$@
+ 	env LANG=C LC_ALL=C awk '{ factor = 1.0; \
+ 	       if ($$4 == "mm") factor = 72.0 / 25.4; \
+ 	       if ($$4 == "in") factor = 72.0; \
+ 	       printf("    { \"%s\", %5f, %5f },\n", \
+-		      $$1, $$2 * factor, $$3 * factor); }' < $< >> $@
++		      $$1, $$2 * factor, $$3 * factor); }' < $< paperspecs >> $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/print/libpaper/files/patch-lib::paper.c b/print/libpaper/files/patch-lib-paper.c
similarity index 59%
rename from print/libpaper/files/patch-lib::paper.c
rename to print/libpaper/files/patch-lib-paper.c
index 285ff1088c0f..04a89ce0ae63 100644
--- a/print/libpaper/files/patch-lib::paper.c
+++ b/print/libpaper/files/patch-lib-paper.c
@@ -1,5 +1,5 @@
---- lib/paper.c.orig	Sun Nov 16 19:56:24 2003
-+++ lib/paper.c	Sun Nov 16 19:56:29 2003
+--- lib/paper.c.orig	Mon Apr  9 10:46:01 2007
++++ lib/paper.c	Mon Apr  9 10:47:01 2007
 @@ -14,7 +14,6 @@
  #include <sys/stat.h>
  
diff --git a/print/libpaper/files/patch-lib::Makefile.in b/print/libpaper/files/patch-lib::Makefile.in
deleted file mode 100644
index d48df1ecb67f..000000000000
--- a/print/libpaper/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Sat Oct 23 12:04:02 2004
-+++ lib/Makefile.in	Mon Feb 14 13:12:45 2005
-@@ -543,7 +543,7 @@
- 	       if ($$4 == "mm") factor = 72.0 / 25.4; \
- 	       if ($$4 == "in") factor = 72.0; \
- 	       printf("    { \"%s\", %5f, %5f },\n", \
--		      $$1, $$2 * factor, $$3 * factor); }' < $< >> $@
-+		      $$1, $$2 * factor, $$3 * factor); }' < paperspecs >> $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: