diff --git a/lang/python35/Makefile b/lang/python35/Makefile
index 95d3b50676353..6d081b0928caf 100644
--- a/lang/python35/Makefile
+++ b/lang/python35/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2016/09/18 12:44:49 kamil Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/19 13:55:53 wen Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python35-${PY_DISTVERSION}
-PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -151,6 +150,10 @@ SUBST_VARS.sslbase=	SSLBASE
 
 CHECK_INTERPRETER_SKIP=	lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
 
+# Avoid error: Cannot generate ./Include/opcode.h, python not found !
+post-configure:
+	touch ${WRKSRC}/Include/opcode.h
+
 .if ${OPSYS} == "HPUX"
 post-install:
 	${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.5.sl \
diff --git a/lang/python35/PLIST b/lang/python35/PLIST
index 1a4a910784599..0fa6d756cf79e 100644
--- a/lang/python35/PLIST
+++ b/lang/python35/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/07/02 15:07:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/01/19 13:55:53 wen Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1341,8 +1341,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -1499,6 +1499,7 @@ lib/python${PY_VER_SUFFIX}/idlelib/MultiStatusBar.py
 lib/python${PY_VER_SUFFIX}/idlelib/MultiStatusBar.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/MultiStatusBar.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/NEWS.txt
+lib/python${PY_VER_SUFFIX}/idlelib/NEWS2x.txt
 lib/python${PY_VER_SUFFIX}/idlelib/ObjectBrowser.py
 lib/python${PY_VER_SUFFIX}/idlelib/ObjectBrowser.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/ObjectBrowser.pyo
@@ -1632,8 +1633,8 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.py
-lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyo
@@ -1644,8 +1645,8 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.py
-lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.pyo
@@ -1655,6 +1656,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_help_about.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_help_about.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_help_about.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
@@ -1671,11 +1675,11 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.py
-lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.py
-lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyo
@@ -1869,9 +1873,6 @@ lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_basestring.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_buffer.py
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_buffer.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_buffer.pyo
-lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_callable.py
-lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_callable.pyc
-lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_callable.pyo
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_dict.py
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_dict.pyc
 lib/python${PY_VER_SUFFIX}/lib2to3/fixes/fix_dict.pyo
@@ -2458,6 +2459,7 @@ lib/python${PY_VER_SUFFIX}/test/__main__.pyo
 lib/python${PY_VER_SUFFIX}/test/_test_multiprocessing.py
 lib/python${PY_VER_SUFFIX}/test/_test_multiprocessing.pyc
 lib/python${PY_VER_SUFFIX}/test/_test_multiprocessing.pyo
+lib/python${PY_VER_SUFFIX}/test/allsans.pem
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-alaw.aifc
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.aiff
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.au
@@ -2514,7 +2516,6 @@ lib/python${PY_VER_SUFFIX}/test/capath/ce7b8643.0
 lib/python${PY_VER_SUFFIX}/test/cfgparser.1
 lib/python${PY_VER_SUFFIX}/test/cfgparser.2
 lib/python${PY_VER_SUFFIX}/test/cfgparser.3
-lib/python${PY_VER_SUFFIX}/test/check_soundcard.vbs
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5hkscs-utf8.txt
@@ -2795,6 +2796,9 @@ lib/python${PY_VER_SUFFIX}/test/mock_socket.pyo
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyc
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyo
+lib/python${PY_VER_SUFFIX}/test/mp_preload.py
+lib/python${PY_VER_SUFFIX}/test/mp_preload.pyc
+lib/python${PY_VER_SUFFIX}/test/mp_preload.pyo
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.py
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyc
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyo
@@ -3977,6 +3981,7 @@ lib/python${PY_VER_SUFFIX}/test/test_operator.pyo
 lib/python${PY_VER_SUFFIX}/test/test_optparse.py
 lib/python${PY_VER_SUFFIX}/test/test_optparse.pyc
 lib/python${PY_VER_SUFFIX}/test/test_optparse.pyo
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
 lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyc
 lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyo
 lib/python${PY_VER_SUFFIX}/test/test_os.py
@@ -4342,6 +4347,39 @@ lib/python${PY_VER_SUFFIX}/test/test_tk.pyo
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.py
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/__main__.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/__main__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/__main__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_fixcid.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_fixcid.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_fixcid.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_gprof2html.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_gprof2html.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_gprof2html.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_i18n.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_i18n.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_i18n.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_md5sum.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_md5sum.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_md5sum.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pdeps.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pdeps.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pdeps.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pindent.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pindent.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_pindent.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_reindent.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_reindent.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_reindent.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_sundry.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_sundry.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_sundry.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_unparse.py
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_unparse.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools/test_unparse.pyo
 lib/python${PY_VER_SUFFIX}/test/test_trace.py
 lib/python${PY_VER_SUFFIX}/test/test_trace.pyc
 lib/python${PY_VER_SUFFIX}/test/test_trace.pyo
@@ -4360,7 +4398,6 @@ lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyo
 lib/python${PY_VER_SUFFIX}/test/test_tuple.py
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyo
-lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
 lib/python${PY_VER_SUFFIX}/test/test_turtle.py
 lib/python${PY_VER_SUFFIX}/test/test_turtle.pyc
 lib/python${PY_VER_SUFFIX}/test/test_turtle.pyo
@@ -4445,6 +4482,18 @@ lib/python${PY_VER_SUFFIX}/test/test_wait3.pyo
 lib/python${PY_VER_SUFFIX}/test/test_wait4.py
 lib/python${PY_VER_SUFFIX}/test/test_wait4.pyc
 lib/python${PY_VER_SUFFIX}/test/test_wait4.pyo
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__main__.py
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__main__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_warnings/__main__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/import_warning.py
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/import_warning.pyc
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/import_warning.pyo
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/stacklevel.py
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/stacklevel.pyc
+lib/python${PY_VER_SUFFIX}/test/test_warnings/data/stacklevel.pyo
 lib/python${PY_VER_SUFFIX}/test/test_wave.py
 lib/python${PY_VER_SUFFIX}/test/test_wave.pyc
 lib/python${PY_VER_SUFFIX}/test/test_wave.pyo
diff --git a/lang/python35/dist.mk b/lang/python35/dist.mk
index c3c0b36a6ac26..599219b854317 100644
--- a/lang/python35/dist.mk
+++ b/lang/python35/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.3 2016/07/02 15:07:47 adam Exp $
+# $NetBSD: dist.mk,v 1.4 2017/01/19 13:55:53 wen Exp $
 
-PY_DISTVERSION=	3.5.2
+PY_DISTVERSION=	3.5.3
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python35/distinfo
diff --git a/lang/python35/distinfo b/lang/python35/distinfo
index fd5d136f4ce63..fc12dea712660 100644
--- a/lang/python35/distinfo
+++ b/lang/python35/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.8 2017/01/05 23:16:42 roy Exp $
+$NetBSD: distinfo,v 1.9 2017/01/19 13:55:53 wen Exp $
 
-SHA1 (Python-3.5.2.tar.xz) = 4843aabacec5bc0cdd3e1f778faa926e532794d2
-RMD160 (Python-3.5.2.tar.xz) = 709be7df28045c4fc8ed40cadd299478439f9522
-SHA512 (Python-3.5.2.tar.xz) = c07c3366f1c81e214241444bb9da6db9d11da32ad66bfa29cdad5a3b2e34e4d870bda6d4ce3c3910b582942e91f1d8c8a1c1a7b9464cc147b83c9e0007012742
-Size (Python-3.5.2.tar.xz) = 15222676 bytes
+SHA1 (Python-3.5.3.tar.xz) = 127121fdca11e735b3686e300d66f73aba663e93
+RMD160 (Python-3.5.3.tar.xz) = 663ad06b0c4b36e7760f5202e73bc53697f225d2
+SHA512 (Python-3.5.3.tar.xz) = bbcc20e315c63dbc8901d7e7bfa29d4dbdad9335720757d8d679730319fd1d9fcfdb55cf62d620c9b052134170f162c28d653a8af60923185b8932524d827864
+Size (Python-3.5.3.tar.xz) = 15213396 bytes
 SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
-SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
-SHA1 (patch-Makefile.pre.in) = 5a27e9bc405b515f10b972ba9fc9421e05e4b7f1
+SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419
+SHA1 (patch-Makefile.pre.in) = 174e01e44c61c756131f795dc96100a381876fcb
 SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
 SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 069f7bb10d98e3616f52859a2cf90c7f5732425e
-SHA1 (patch-setup.py) = 01e56057bb35225a513ef4a76a69f695f760c6ca
+SHA1 (patch-setup.py) = 42385e851af583ab5a460f6ca7b73e98697e268e
diff --git a/lang/python35/patches/patch-Lib_distutils_unixccompiler.py b/lang/python35/patches/patch-Lib_distutils_unixccompiler.py
index a0a5ef37ef59a..6cae9e4829c29 100644
--- a/lang/python35/patches/patch-Lib_distutils_unixccompiler.py
+++ b/lang/python35/patches/patch-Lib_distutils_unixccompiler.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2016/02/23 15:07:36 joerg Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2017/01/19 13:55:53 wen Exp $
 
 Do not force RUNPATH vs RPATH, trust the compiler to know what the
 platform wants.
 
---- Lib/distutils/unixccompiler.py.orig	2013-05-15 16:32:54.000000000 +0000
+--- Lib/distutils/unixccompiler.py.orig	2017-01-17 07:57:48.000000000 +0000
 +++ Lib/distutils/unixccompiler.py
-@@ -232,22 +232,7 @@ class UnixCCompiler(CCompiler):
+@@ -236,22 +236,7 @@ class UnixCCompiler(CCompiler):
          elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
              return ["-rpath", dir]
          else:
@@ -29,3 +29,12 @@
  
      def library_option(self, lib):
          return "-l" + lib
+@@ -298,7 +283,7 @@ class UnixCCompiler(CCompiler):
+ 
+             if sys.platform == 'darwin' and (
+                 dir.startswith('/System/') or (
+-                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
++                dir.startswith('/usr/') and not dir.startswith('/usr/pkg/'))):
+ 
+                 shared = os.path.join(sysroot, dir[1:], shared_f)
+                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
diff --git a/lang/python35/patches/patch-Makefile.pre.in b/lang/python35/patches/patch-Makefile.pre.in
index 587205e5b5405..76f5b5250cf9c 100644
--- a/lang/python35/patches/patch-Makefile.pre.in
+++ b/lang/python35/patches/patch-Makefile.pre.in
@@ -1,47 +1,45 @@
-$NetBSD: patch-Makefile.pre.in,v 1.2 2016/07/02 15:07:48 adam Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.3 2017/01/19 13:55:53 wen Exp $
 
-Use only one optimisation level; needed for PLIST and setuptools compatibility.
-
---- Makefile.pre.in.orig	2016-06-25 21:38:37.000000000 +0000
+--- Makefile.pre.in.orig	2017-01-19 11:35:21.000000000 +0000
 +++ Makefile.pre.in
-@@ -91,7 +91,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
+@@ -92,7 +92,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
  # environment variables
- PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+ PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
 -PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
 +PY_LDFLAGS=	-L. $(CONFIGURE_LDFLAGS) $(LDFLAGS)
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -724,7 +724,7 @@ Python/importlib_external.h: $(srcdir)/L
- 	        $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \
- 	fi
+@@ -723,7 +723,7 @@ Python/importlib_external.h: @GENERATED_
+ 	./Programs/_freeze_importlib \
+ 	    $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
+ 
+-Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
++Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	./Programs/_freeze_importlib \
+ 	    $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
  
--Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
-+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib $(LIBRARY_OBJS_OMIT_FROZEN)
- 	if test "$(cross_compiling)" != "yes"; then \
- 	    ./Programs/_freeze_importlib \
- 	        $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
-@@ -882,7 +882,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
+@@ -868,7 +868,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
  $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
- 	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
+ 	$(PYTHON_FOR_GEN) $(OPCODETARGETGEN) $(OPCODETARGETS_H)
  
 -Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
 +#Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h
  
  Python/frozen.o: Python/importlib.h Python/importlib_external.h
  
-@@ -1122,7 +1122,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1108,7 +1108,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \
 -	else	true; \
 +	elif test -f $(INSTSONAME); then \
-+               $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \
++		$(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \
  	fi
  	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
  		rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1312,11 +1313,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+@@ -1299,11 +1300,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  		$(DESTDIR)$(LIBDEST)
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -53,7 +51,7 @@ Use only one optimisation level; needed for PLIST and setuptools compatibility.
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1325,10 +1321,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+@@ -1312,10 +1308,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
diff --git a/lang/python35/patches/patch-setup.py b/lang/python35/patches/patch-setup.py
index 754cd1307399e..8993b50b9e31e 100644
--- a/lang/python35/patches/patch-setup.py
+++ b/lang/python35/patches/patch-setup.py
@@ -1,8 +1,17 @@
-$NetBSD: patch-setup.py,v 1.2 2016/07/02 15:07:48 adam Exp $
+$NetBSD: patch-setup.py,v 1.3 2017/01/19 13:55:53 wen Exp $
 
---- setup.py.orig	2016-06-25 21:38:39.000000000 +0000
+--- setup.py.orig	2017-01-17 07:57:54.000000000 +0000
 +++ setup.py
-@@ -44,7 +44,8 @@ host_platform = get_platform()
+@@ -7,7 +7,7 @@ import importlib._bootstrap
+ import importlib.util
+ import sysconfig
+ 
+-from distutils import log
++from distutils import log,text_file
+ from distutils.errors import *
+ from distutils.core import Extension, setup
+ from distutils.command.build_ext import build_ext
+@@ -43,7 +43,8 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -12,7 +21,7 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (after any relative
-@@ -488,15 +489,15 @@ class PyBuildExt(build_ext):
+@@ -487,15 +488,15 @@ class PyBuildExt(build_ext):
              return ['m']
  
      def detect_modules(self):
@@ -37,17 +46,17 @@ def detect_modules(self):
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -809,8 +810,7 @@ class PyBuildExt(build_ext):
+@@ -808,8 +809,7 @@ class PyBuildExt(build_ext):
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
 -                              '/usr/local/ssl/include',
 -                              '/usr/contrib/ssl/include/'
-+                              '@SSLBASE@/include'
++                              '/usr/include'
                               ]
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
                               search_for_ssl_incs_in
-@@ -821,9 +821,7 @@ class PyBuildExt(build_ext):
+@@ -820,9 +820,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -58,7 +67,7 @@ def detect_modules(self):
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -842,7 +840,7 @@ class PyBuildExt(build_ext):
+@@ -841,7 +839,7 @@ class PyBuildExt(build_ext):
  
          # look for the openssl version header on the compiler search path.
          opensslv_h = find_file('openssl/opensslv.h', [],
@@ -67,7 +76,7 @@ def detect_modules(self):
          if opensslv_h:
              name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
              if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -1216,6 +1214,30 @@ class PyBuildExt(build_ext):
+@@ -1215,6 +1213,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -98,7 +107,7 @@ def detect_modules(self):
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1227,7 +1249,7 @@ class PyBuildExt(build_ext):
+@@ -1226,7 +1248,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -107,7 +116,7 @@ def detect_modules(self):
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -2027,10 +2049,7 @@ class PyBuildExt(build_ext):
+@@ -2028,10 +2050,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -119,7 +128,7 @@ def detect_modules(self):
              libraries = []
              sources = [
                '_decimal/_decimal.c',
-@@ -2276,7 +2295,7 @@ def main():
+@@ -2277,7 +2296,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in