diff --git a/x11/pinot/Makefile b/x11/pinot/Makefile
index 7ae12533d82..9a210f158c2 100644
--- a/x11/pinot/Makefile
+++ b/x11/pinot/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2011/01/16 19:52:11 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2011/05/08 13:20:28 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	personal search and metasearch
 
 DISTNAME=	pinot-0.97
+REVISION=	0
 
 CATEGORIES=	x11 misc
 
@@ -30,8 +31,7 @@ WANTLIB += textcat xapian GL Xxf86vm drm xcb-shm
 
 MASTER_SITES=	${MASTER_SITE_BERLIOS:=pinot/}
 
-MODULES=	devel/gettext \
-		lang/python
+MODULES=	devel/gettext
 
 BUILD_DEPENDS=	devel/boost \
 		misc/shared-mime-info \
@@ -67,9 +67,6 @@ USE_LIBTOOL=	gnu
 
 USE_GROFF=	Yes
 
-MODPY_BUILDDEP=	No
-MODPY_RUNDEP=	No
-
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/x11/pinot/patches/patch-Makefile_in b/x11/pinot/patches/patch-Makefile_in
index c16e4835bcd..9a00ba0390e 100644
--- a/x11/pinot/patches/patch-Makefile_in
+++ b/x11/pinot/patches/patch-Makefile_in
@@ -1,17 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2011/01/10 22:20:53 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.5 2011/05/08 13:20:28 ajacoutot Exp $
 --- Makefile.in.orig	Thu Jan  6 11:36:55 2011
-+++ Makefile.in	Mon Jan 10 23:13:36 2011
-@@ -934,10 +934,10 @@ install-data-local:
++++ Makefile.in	Sun May  8 15:05:42 2011
+@@ -934,10 +934,6 @@ install-data-local:
  	@desktop-file-install --vendor="" --dir=$(DESTDIR)$(datadir)/applications $(srcdir)/pinot-prefs.desktop
  	@mkdir -p $(DESTDIR)${sysconfdir}/xdg/autostart
  @HAVE_DBUS_TRUE@	@desktop-file-install --vendor="" --dir=$(DESTDIR)${sysconfdir}/xdg/autostart $(srcdir)/pinot-dbus-daemon.desktop
 -	@mkdir -p $(DESTDIR)$(libdir)/deskbar-applet/handlers/
 -	$(INSTALL_DATA) $(srcdir)/scripts/python/pinot-live.py $(DESTDIR)$(libdir)/deskbar-applet/handlers/
-+	@mkdir -p $(DESTDIR)$(libdir)/python${MODPY_VERSION}/site-packages/deskbar/handlers/
-+	$(INSTALL_DATA) $(srcdir)/scripts/python/pinot-live.py $(DESTDIR)$(libdir)/python${MODPY_VERSION}/site-packages/deskbar/handlers/
- 	@mkdir -p $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible/
+-	@mkdir -p $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible/
 -	$(INSTALL_DATA) $(srcdir)/scripts/python/pinot-module.py $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible/
-+	$(INSTALL_DATA) $(srcdir)/scripts/python/pinot-module.py $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible
  	$(INSTALL_DATA) $(srcdir)/scripts/bash/*.sh $(DESTDIR)$(datadir)/pinot/
  
  uninstall-local:
diff --git a/x11/pinot/pkg/PLIST b/x11/pinot/pkg/PLIST
index 7e676ab439e..26314fea5a8 100644
--- a/x11/pinot/pkg/PLIST
+++ b/x11/pinot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2009/12/21 20:46:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/05/08 13:20:28 ajacoutot Exp $
 @bin bin/pinot
 @bin bin/pinot-dbus-daemon
 @bin bin/pinot-index
@@ -13,14 +13,6 @@ lib/pinot/filters/libexifimagefilter.so
 lib/pinot/filters/libexternalfilter.so
 lib/pinot/filters/libmboxfilter.so
 lib/pinot/filters/libtaglibfilter.so
-lib/python${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/
-lib/python${MODPY_VERSION}/site-packages/deskbar/
-lib/python${MODPY_VERSION}/site-packages/deskbar/handlers/
-lib/python${MODPY_VERSION}/site-packages/deskbar/handlers/pinot-live.py
-libexec/deskbar-applet/
-libexec/deskbar-applet/modules-2.20-compatible/
-libexec/deskbar-applet/modules-2.20-compatible/pinot-module.py
 @man man/man1/pinot-dbus-daemon.1
 @man man/man1/pinot-index.1
 @man man/man1/pinot-label.1