diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 2abf6680c3a..5234deaedc0 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/11/15 15:55:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2007/11/17 11:06:14 ajacoutot Exp $
 
 COMMENT=	video DVDs and CDs creation tool
 
 DISTNAME=	devede-3.3
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	multimedia x11
 
 EXTRACT_SUFX=	.tar.bz2
@@ -41,6 +42,9 @@ NO_REGRESS=	Yes
 pre-configure:
 	@find ${WRKSRC} -name \*.py | \
 		xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
+	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \
+		-e 's,!!PREFIX!!,${PREFIX},g' \
+		${WRKSRC}/{devede_other,devede_executor,devede}.py
 
 do-install:
 	cd ${WRKSRC} && /bin/sh install.sh prefix=${TRUEPREFIX} uninstall=no
diff --git a/multimedia/devede/patches/patch-devede_executor_py b/multimedia/devede/patches/patch-devede_executor_py
new file mode 100644
index 00000000000..f3fce2bb4f8
--- /dev/null
+++ b/multimedia/devede/patches/patch-devede_executor_py
@@ -0,0 +1,12 @@
+$OpenBSD: patch-devede_executor_py,v 1.1 2007/11/17 11:06:14 ajacoutot Exp $
+--- devede_executor.py.orig	Sat Nov 17 11:48:18 2007
++++ devede_executor.py	Sat Nov 17 11:49:23 2007
+@@ -140,7 +140,7 @@ class executor:
+ 		self.output=output
+ 
+ 		wd=sys.path[-1:] # working directory.  This works with py2exe
+-		pathlist=["/usr/bin","/usr/local/bin","/usr/share/bin","/usr/share/local/bin","/bin", os.path.join(wd[0],"bin"), r'C:\WINDOWS', r'C:\WINDOWS\system32', r'C:\WINNT']
++		pathlist=["!!LOCALBASE!!/bin","/usr/bin","/usr/local/bin","/usr/share/bin","/usr/share/local/bin","/bin", os.path.join(wd[0],"bin"), r'C:\WINDOWS', r'C:\WINDOWS\system32', r'C:\WINNT']
+ 
+ 		print "Launching program:"
+ 		print "program: ",program
diff --git a/multimedia/devede/patches/patch-devede_other_py b/multimedia/devede/patches/patch-devede_other_py
new file mode 100644
index 00000000000..772fb838cda
--- /dev/null
+++ b/multimedia/devede/patches/patch-devede_other_py
@@ -0,0 +1,12 @@
+$OpenBSD: patch-devede_other_py,v 1.1 2007/11/17 11:06:14 ajacoutot Exp $
+--- devede_other.py.orig	Sat Nov 17 11:48:11 2007
++++ devede_other.py	Sat Nov 17 11:49:44 2007
+@@ -70,7 +70,7 @@ def launch_program(program,salida=True):
+ 	curDir=sys.path[-1:] # Allow launching programs from local directory when use py2exe
+ 	pathlist=[]
+ 	if not sys.platform == 'win32':
+-		pathlist=["/usr/bin","/usr/local/bin","/usr/share/bin","/usr/share/local/bin","/bin"]
++		pathlist=["!!LOCALBASE!!/bin","/usr/bin","/usr/local/bin","/usr/share/bin","/usr/share/local/bin","/bin"]
+ 	else:
+ 		pathlist=[os.path.join(curDir[0],"bin"), r'C:\WINDOWS', r'C:\WINDOWS\system32', r'C:\WINNT']
+ 	
diff --git a/multimedia/devede/patches/patch-devede_py b/multimedia/devede/patches/patch-devede_py
new file mode 100644
index 00000000000..95e9edadc17
--- /dev/null
+++ b/multimedia/devede/patches/patch-devede_py
@@ -0,0 +1,30 @@
+$OpenBSD: patch-devede_py,v 1.1 2007/11/17 11:06:14 ajacoutot Exp $
+--- devede.py.orig	Sat Nov 17 11:49:57 2007
++++ devede.py	Sat Nov 17 11:57:06 2007
+@@ -55,7 +55,7 @@ except:
+ 
+ if found==False:
+ 	try:
+-		fichero=open("/usr/local/share/devede/devede.glade","r")
++		fichero=open("!!PREFIX!!/share/devede/devede.glade","r")
+ 		fichero.close()
+ 		tipo=1
+ 		found=True
+@@ -94,12 +94,11 @@ elif tipo==1:
+ 	#gtk.glade.bindtextdomain("devede","/usr/share/locale")
+ 	#arbol=gtk.glade.XML("/usr/local/share/devede/devede.glade",domain="devede")
+ 
+-	share_locale="/usr/share/locale" # Are you sure?
+-	# if the files aren't at /usr, try with /usr/local
+-	glade="/usr/local/share/devede/devede.glade"
+-	sys.path.append("/usr/local/lib/devede")
+-	font_path="/usr/local/share/devede"
+-	pic_path="/usr/local/share/devede"
++	share_locale="!!LOCALBASE!!/share/locale"
++	glade="!!PREFIX!!/share/devede/devede.glade"
++	sys.path.append("!!PREFIX!!/lib/devede")
++	font_path="!!PREFIX!!/share/devede"
++	pic_path="!!PREFIX!!/share/devede"
+ elif tipo==2:
+ 	# if the files aren't at /usr/local, try with ./
+ 	#gettext.bindtextdomain('devede', './po/')