diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 44fac2999f7..51af286ea45 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/11 11:10:51 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/22 14:53:09 dcoppa Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
@@ -8,6 +8,7 @@ COMMENT=	photorealistic 3D rendering solution
 
 V=		1.8.2
 DISTNAME=	aqsis-${V}
+REVISION=	0
 CATEGORIES=	graphics
 
 SO_VERSION=	1.0 # 1.6
@@ -27,7 +28,7 @@ WANTLIB += GL Half Iex IlmImf IlmThread Imath boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_program_options-mt boost_regex-mt
 WANTLIB += boost_system-mt boost_thread-mt boost_wave-mt c
 WANTLIB += lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtOpenGL
-WANTLIB += m pthread stdc++ tiff tiffxx z
+WANTLIB += m png pthread stdc++ tiff tiffxx z
 
 MODULES=	devel/cmake
 
@@ -55,11 +56,6 @@ CONFIGURE_ARGS=	-DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME=boost_filesystem-mt \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DSYSCONFDIR="${SYSCONFDIR}"
 
-pre-build:
-.for i in build.make link.txt relink.txt
-	find ${WRKBUILD} -name ${i} -exec perl -pi -e 's,-ldl,,g' {} \;
-.endfor
-
 pre-configure:
 	perl -pi -e 's,!!LIBaqsis_core_VERSION_R!!,${LIBaqsis_core_VERSION:R},;' \
 		-e 's,!!LIBaqsis_core_VERSION_E!!,${LIBaqsis_core_VERSION:E},' \
diff --git a/graphics/aqsis/patches/patch-CMakeLists_txt b/graphics/aqsis/patches/patch-CMakeLists_txt
index 31562cedb2c..d439298fbed 100644
--- a/graphics/aqsis/patches/patch-CMakeLists_txt
+++ b/graphics/aqsis/patches/patch-CMakeLists_txt
@@ -1,6 +1,15 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/03/08 01:24:44 brad Exp $
---- CMakeLists.txt.orig	Tue Nov 20 17:31:42 2012
-+++ CMakeLists.txt	Tue Nov 20 17:33:12 2012
+$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/06/22 14:53:09 dcoppa Exp $
+--- CMakeLists.txt.orig	Fri Aug 24 14:26:49 2012
++++ CMakeLists.txt	Fri Jun 21 15:36:05 2013
+@@ -40,7 +40,7 @@ option(AQSIS_ENABLE_THREADING "Enable multi-threading 
+ option(AQSIS_ENABLE_DOCS "Enable documentation generation" ON)
+ mark_as_advanced(AQSIS_ENABLE_MPDUMP AQSIS_ENABLE_MASSIVE AQSIS_ENABLE_SIMBIONT)
+ 
+-option(AQSIS_USE_RPATH "Enable runtime path for installed libs" ON)
++option(AQSIS_USE_RPATH "Enable runtime path for installed libs" OFF)
+ mark_as_advanced(AQSIS_USE_RPATH)
+ 
+ if(WIN32)
 @@ -196,8 +196,8 @@ endif()
  # These are needed by version.h, as well as the packaging stuff.  Note that
  # some packaging variables are set in the platform-specific config files, and
diff --git a/graphics/aqsis/patches/patch-libs_util_CMakeLists_txt b/graphics/aqsis/patches/patch-libs_util_CMakeLists_txt
new file mode 100644
index 00000000000..060031dd8eb
--- /dev/null
+++ b/graphics/aqsis/patches/patch-libs_util_CMakeLists_txt
@@ -0,0 +1,14 @@
+$OpenBSD: patch-libs_util_CMakeLists_txt,v 1.1 2013/06/22 14:53:09 dcoppa Exp $
+--- libs/util/CMakeLists.txt.orig	Thu Jun 20 16:30:49 2013
++++ libs/util/CMakeLists.txt	Thu Jun 20 16:31:14 2013
+@@ -36,9 +36,7 @@ set(util_test_srcs
+ #argparse_test.cpp  # <-- TODO: make into a unit test
+ 
+ set(linklibs ${Boost_FILESYSTEM_LIBRARY})
+-if(UNIX)
+-	list(APPEND linklibs dl)
+-elseif(WIN32)
++if(WIN32)
+ 	list(APPEND linklibs ws2_32)
+ endif()
+ if(Boost_SYSTEM_FOUND)
diff --git a/graphics/aqsis/patches/patch-libs_util_plugins_cpp b/graphics/aqsis/patches/patch-libs_util_plugins_cpp
index 017514a3c69..9c135fbaada 100644
--- a/graphics/aqsis/patches/patch-libs_util_plugins_cpp
+++ b/graphics/aqsis/patches/patch-libs_util_plugins_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libs_util_plugins_cpp,v 1.1 2010/09/22 12:52:36 ajacoutot Exp $
---- libs/util/plugins.cpp.orig	Tue Oct 20 21:45:45 2009
-+++ libs/util/plugins.cpp	Tue Oct 20 21:45:58 2009
-@@ -170,7 +170,7 @@ CqPluginBase::DLError( void )
+$OpenBSD: patch-libs_util_plugins_cpp,v 1.2 2013/06/22 14:53:09 dcoppa Exp $
+--- libs/util/plugins.cpp.orig	Fri Aug 24 14:26:50 2012
++++ libs/util/plugins.cpp	Thu Jun 20 16:48:33 2013
+@@ -171,7 +171,7 @@ CqPluginBase::DLError( void )
  	LocalFree( lpMsgBuf );
  #else //not defined AQSIS_SYSTEM_MACOSX