diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile
index 59f699dc259..87474b8d8a3 100644
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.43 2006/01/02 20:22:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.44 2006/01/02 22:44:50 sturm Exp $
 
 COMMENT=	"GNU PostScript interpreter"
 
 VERSION=	7.05
 DISTNAME=	ghostscript-${VERSION}
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	print lang
+SHARED_LIBS=	gs	7.05
 
 DIR=		gnu/gs${VERSION:S/.//}
 MASTER_SITES=	${GS_SITES} ${MASTER_SITE_GNU:=ghostscript/}
@@ -53,7 +54,8 @@ BASE_FLAGS=	INSTALL_PROGRAM='${INSTALL_SCRIPT}' \
 		PSOBJDIR=./objects \
 		PSGENDIR=./objects \
 		STDLIBS='-pthread -lm' \
-		DEVICE_DEVS=
+		DEVICE_DEVS= \
+		LIBgs_VERSION=${LIBgs_VERSION}
 
 PDFDIR=share/ghostscript/${VERSION}/lib
 
diff --git a/print/ghostscript/gnu/patches/patch-lib_ps2epsi b/print/ghostscript/gnu/patches/patch-lib_ps2epsi
index fd6f5d283ac..a7b62210c70 100644
--- a/print/ghostscript/gnu/patches/patch-lib_ps2epsi
+++ b/print/ghostscript/gnu/patches/patch-lib_ps2epsi
@@ -1,9 +1,9 @@
-$OpenBSD: patch-lib_ps2epsi,v 1.3 2004/10/24 20:58:47 brad Exp $
---- lib/ps2epsi.orig	Mon Apr 22 16:18:24 2002
-+++ lib/ps2epsi	Sun Oct 24 16:54:58 2004
+$OpenBSD: patch-lib_ps2epsi,v 1.4 2006/01/02 22:44:50 sturm Exp $
+--- lib/ps2epsi.orig	Mon Apr 22 22:18:24 2002
++++ lib/ps2epsi	Mon Jan  2 22:14:16 2006
 @@ -1,7 +1,7 @@
  #!/bin/sh
- # $Id: patch-lib_ps2epsi,v 1.3 2004/10/24 20:58:47 brad Exp $
+ # $Id: patch-lib_ps2epsi,v 1.4 2006/01/02 22:44:50 sturm Exp $
  
 -tmpfile=/tmp/ps2epsi$$
 +tmpfile=`mktemp -t ps2epsiXXXXXXXXXX` || exit 1
diff --git a/print/ghostscript/gnu/patches/patch-src_unix-dll_mak b/print/ghostscript/gnu/patches/patch-src_unix-dll_mak
index 1e66a203f64..321ee519382 100644
--- a/print/ghostscript/gnu/patches/patch-src_unix-dll_mak
+++ b/print/ghostscript/gnu/patches/patch-src_unix-dll_mak
@@ -1,6 +1,22 @@
-$OpenBSD: patch-src_unix-dll_mak,v 1.2 2005/01/25 17:19:33 alek Exp $
+$OpenBSD: patch-src_unix-dll_mak,v 1.3 2006/01/02 22:44:50 sturm Exp $
 --- src/unix-dll.mak.orig	Fri Apr 19 03:10:40 2002
-+++ src/unix-dll.mak	Tue Jan 25 12:19:16 2005
++++ src/unix-dll.mak	Mon Jan  2 22:15:16 2006
+@@ -46,11 +46,11 @@ GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_X
+ 
+ # shared library
+ GS_SONAME=lib$(GS).so
+-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
+-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
++GS_SONAME_MAJOR=$(GS_SONAME).$(LIBgs_VERSION:R)
++GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(LIBgs_VERSION)
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)
+-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)
++GS_SO_MAJOR=$(GS_SO).$(LIBgs_VERSION:R)
++GS_SO_MAJOR_MINOR=$(GS_SO).$(LIBgs_VERSION)
+ 
+ # Shared object is built by redefining GS_XE in a recursive make.
+ 
 @@ -70,11 +70,11 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
  	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
  
diff --git a/print/ghostscript/gnu/patches/patch-src_zcolor2_c b/print/ghostscript/gnu/patches/patch-src_zcolor2_c
index a78defe2e7e..26a5f9a807e 100644
--- a/print/ghostscript/gnu/patches/patch-src_zcolor2_c
+++ b/print/ghostscript/gnu/patches/patch-src_zcolor2_c
@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_zcolor2_c,v 1.2 2003/12/30 02:29:12 espie Exp $
---- src/zcolor2.c.orig	2002-02-22 20:46:00.000000000 +0100
-+++ src/zcolor2.c	2003-12-30 03:21:23.000000000 +0100
+$OpenBSD: patch-src_zcolor2_c,v 1.3 2006/01/02 22:44:50 sturm Exp $
+--- src/zcolor2.c.orig	Fri Feb 22 20:46:00 2002
++++ src/zcolor2.c	Mon Jan  2 22:14:16 2006
 @@ -16,6 +16,7 @@
  
- /*$Id: patch-src_zcolor2_c,v 1.2 2003/12/30 02:29:12 espie Exp $ */
+ /*$Id: patch-src_zcolor2_c,v 1.3 2006/01/02 22:44:50 sturm Exp $ */
  /* Level 2 color operators */
 +#include <string.h>
  #include "ghost.h"
diff --git a/print/ghostscript/gnu/pkg/PFRAG.gtk b/print/ghostscript/gnu/pkg/PFRAG.gtk
index 7d622e24622..3a97e24ba64 100644
--- a/print/ghostscript/gnu/pkg/PFRAG.gtk
+++ b/print/ghostscript/gnu/pkg/PFRAG.gtk
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PFRAG.gtk,v 1.2 2004/08/11 10:42:55 espie Exp $
+@comment $OpenBSD: PFRAG.gtk,v 1.3 2006/01/02 22:44:50 sturm Exp $
 bin/gsc
 bin/gsx
-lib/libgs.so
-lib/libgs.so.7
-@lib lib/libgs.so.${VERSION}
+@comment lib/libgs.so
+@comment lib/libgs.so.7
+@lib lib/libgs.so.${LIBgs_VERSION}