diff --git a/misc/gpsd/Makefile b/misc/gpsd/Makefile
index aa0290031e3..46e6a757f34 100644
--- a/misc/gpsd/Makefile
+++ b/misc/gpsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2008/04/13 21:24:07 kili Exp $
+# $OpenBSD: Makefile,v 1.23 2008/04/16 06:53:35 ckuethe Exp $
 
 COMMENT-main=		service daemon that monitors one or more GPSes
 COMMENT-motif=		motif-based test apps using gpsd
@@ -7,10 +7,10 @@ COMMENT-python=		python bindings for gpsd
 
 VERSION=		2.37
 DISTNAME=		gpsd-${VERSION}
-PKGNAME-main=		gpsd-${VERSION}
+PKGNAME-main=		gpsd-${VERSION}p0
 PKGNAME-motif=		gpsd-motif-${VERSION}
 PKGNAME-php=		gpsd-php-${VERSION}
-PKGNAME-python=		gpsd-python-${VERSION}
+PKGNAME-python=		gpsd-python-${VERSION}p0
 SHARED_LIBS=		gps	17.0
 CATEGORIES=		misc geo
 
diff --git a/misc/gpsd/pkg/PLIST-main b/misc/gpsd/pkg/PLIST-main
index 877a0865606..a898d657818 100644
--- a/misc/gpsd/pkg/PLIST-main
+++ b/misc/gpsd/pkg/PLIST-main
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2008/01/22 11:43:38 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2008/04/16 06:53:35 ckuethe Exp $
 @newuser _gpsd:551:dialer::GPS server:/nonexistent:/sbin/nologin
 %%SHARED%%
 bin/cgps
 bin/cgpxlogger
+bin/gpsctl
 bin/gpsflash
 bin/gpspipe
 bin/rtcmdecode
@@ -15,11 +16,12 @@ lib/libgps.a
 lib/libgps.la
 lib/pkgconfig/
 lib/pkgconfig/libgps.pc
-@comment lib/pkgconfig/libgpsd.pc
+lib/pkgconfig/libgpsd.pc
 @man man/man1/cgps.1
 @man man/man1/cgpxlogger.1
 @man man/man1/gps.1
 @man man/man1/gpsflash.1
+@man man/man1/gpscat.1
 @man man/man1/gpspipe.1
 @man man/man1/rtcmdecode.1
 @man man/man1/sirfmon.1
diff --git a/misc/gpsd/pkg/PLIST-python b/misc/gpsd/pkg/PLIST-python
index 894d247b0ee..2a5b1dcf9bd 100644
--- a/misc/gpsd/pkg/PLIST-python
+++ b/misc/gpsd/pkg/PLIST-python
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST-python,v 1.1 2007/02/08 23:03:38 ckuethe Exp $
+@comment $OpenBSD: PLIST-python,v 1.2 2008/04/16 06:53:35 ckuethe Exp $
 bin/gpscat
-bin/gpsctl
 bin/gpsfake
 bin/gpsprof
 lib/python${MODPY_VERSION}/
@@ -11,7 +10,6 @@ lib/python${MODPY_VERSION}/site-packages/gps.pyo
 lib/python${MODPY_VERSION}/site-packages/gpsfake.py
 lib/python${MODPY_VERSION}/site-packages/gpsfake.pyc
 lib/python${MODPY_VERSION}/site-packages/gpsfake.pyo
-@man man/man1/gpscat.1
 @man man/man1/gpsctl.1
 @man man/man1/gpsfake.1
 @man man/man1/gpsprof.1