diff --git a/math/z3/Makefile b/math/z3/Makefile
index c20e714d0ee..05bbbbd87a1 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -1,13 +1,16 @@
-# $OpenBSD: Makefile,v 1.7 2018/06/19 17:48:49 jca Exp $
+# $OpenBSD: Makefile,v 1.8 2018/09/15 13:27:29 rsadowski Exp $
 
 COMMENT =	z3 theorem prover
 
 VERSION =	4.7.1
 DISTNAME =	z3-${VERSION}
+REVISION =	0
 
 GH_ACCOUNT =	Z3Prover
 GH_PROJECT =	z3
 
+SHARED_LIBS =	z3			0.0
+
 CATEGORIES =	math
 
 WANTLIB +=	c m pthread ${COMPILER_LIBCXX}
@@ -27,6 +30,9 @@ MODULES =	lang/python
 
 WRKDIST =	${WRKDIR}/z3-${DISTNAME}
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/scripts/mk_util.py
+
 do-build:
 	cd ${WRKSRC}/build && make
 
diff --git a/math/z3/patches/patch-scripts_mk_util_py b/math/z3/patches/patch-scripts_mk_util_py
new file mode 100644
index 00000000000..6ff0fb01cb7
--- /dev/null
+++ b/math/z3/patches/patch-scripts_mk_util_py
@@ -0,0 +1,23 @@
+$OpenBSD: patch-scripts_mk_util_py,v 1.1 2018/09/15 13:27:29 rsadowski Exp $
+
+Index: scripts/mk_util.py
+--- scripts/mk_util.py.orig
++++ scripts/mk_util.py
+@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
+ CSC_COMPILERS=['csc', 'mcs']
+ JAVAC=None
+ JAR=None
+-PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
++PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("LOCALBASE", None))
+ BUILD_DIR='build'
+ REV_BUILD_DIR='..'
+ SRC_DIR='src'
+@@ -2528,7 +2528,7 @@ def mk_config():
+         elif sysname == 'OpenBSD':
+             CXXFLAGS       = '%s -D_OPENBSD_' % CXXFLAGS
+             OS_DEFINES     = '-D_OPENBSD_'
+-            SO_EXT         = '.so'
++            SO_EXT         = '.so.${LIBz3_VERSION}'
+             SLIBFLAGS      = '-shared'
+         elif sysname.startswith('CYGWIN'):
+             CXXFLAGS       = '%s -D_CYGWIN' % CXXFLAGS
diff --git a/math/z3/pkg/PLIST b/math/z3/pkg/PLIST
index 0eafc47f727..c3d249cd7cb 100644
--- a/math/z3/pkg/PLIST
+++ b/math/z3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/04/10 08:17:38 rpointel Exp $
+@comment $OpenBSD: PLIST,v 1.3 2018/09/15 13:27:29 rsadowski Exp $
 @bin bin/z3
 include/z3++.h
 include/z3.h
@@ -14,12 +14,12 @@ include/z3_polynomial.h
 include/z3_rcf.h
 include/z3_spacer.h
 include/z3_v1.h
-lib/libz3.so
+@lib lib/libz3.so.${LIBz3_VERSION}
 lib/python${MODPY_VERSION}/site-packages/z3/
 lib/python${MODPY_VERSION}/site-packages/z3/__init__.py
 lib/python${MODPY_VERSION}/site-packages/z3/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/z3/lib/
-lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
+@lib lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so.${LIBz3_VERSION}
 lib/python${MODPY_VERSION}/site-packages/z3/z3.py
 lib/python${MODPY_VERSION}/site-packages/z3/z3.pyc
 lib/python${MODPY_VERSION}/site-packages/z3/z3consts.py