diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 0225283f042..14d012a6175 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/03/27 17:08:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2007/03/28 17:14:02 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,6 +6,7 @@ COMMENT=	"photorealistic 3D rendering solution"
 
 V=		1.2.0
 DISTNAME=	aqsis-${V}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	graphics
 
 SHARED_LIBS+=	aqsis		1.0 \
@@ -39,7 +40,7 @@ LIB_DEPENDS=	fltk.>=1::x11/fltk \
 
 NO_REGRESS=	Yes
 
-MAKE_ENV+=	CC=${CC} CXX=${CXX} LDFLAGS="-L${X11BASE}/lib" VERSION_STR=1.2.0
+MAKE_ENV+=	CC=${CC} CXX=${CXX} LDFLAGS="-fPIC -L${X11BASE}/lib" VERSION_STR=1.2.0
 
 pre-configure:
 	perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
@@ -60,7 +61,7 @@ do-build:
 		fltk_lib_path=${LOCALBASE}/lib \
 		exr_include_path=${LOCALBASE}/include/OpenEXR \
 		exr_lib_path=${LOCALBASE}/include \
-		bison=/usr/local/bin/bison \
+		bison=${LOCALBASE}/bin/bison \
 		sysconfdir=${SYSCONFDIR} \
 		destdir=${DESTDIR} \
 		install_prefix='${PREFIX}' build
diff --git a/graphics/aqsis/patches/patch-platform_default_SConscript b/graphics/aqsis/patches/patch-platform_default_SConscript
index 07991e002f5..5127d85c495 100644
--- a/graphics/aqsis/patches/patch-platform_default_SConscript
+++ b/graphics/aqsis/patches/patch-platform_default_SConscript
@@ -1,6 +1,15 @@
-$OpenBSD: patch-platform_default_SConscript,v 1.1 2007/03/27 17:09:15 ajacoutot Exp $
+$OpenBSD: patch-platform_default_SConscript,v 1.2 2007/03/28 17:14:02 ajacoutot Exp $
 --- platform/default/SConscript.orig	Sun Feb  4 11:44:55 2007
-+++ platform/default/SConscript	Thu Feb 22 11:05:05 2007
++++ platform/default/SConscript	Wed Mar 28 13:47:31 2007
+@@ -15,7 +15,7 @@ if os.environ.has_key('CXXFLAGS'):
+ if os.environ.has_key('LDFLAGS'):
+ 	env.AppendUnique(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
+ 
+-env.AppendUnique(CCFLAGS=['-Wall','-g', '-O2'])
++env.AppendUnique(CCFLAGS=['-Wall','-g'])
+ env.AppendUnique(CPPPATH = [env.Dir('#/aqsistypes/posix')])
+ env.AppendUnique(CPPDEFINES=[('PLUGINS', '1')])
+ 
 @@ -24,7 +24,7 @@ if not env['debug']:
  
  # Point at the boost headers.